Merge pull request #2 from anotheria/master

Merge request