Merge pull request #3 from Athemis/master