Merge pull request #9 from manjaro/master

Merge pull request #2 from anexation/master