Merge pull request #2 from anexation/master

merge