Merge pull request #10 from Psylynce/master

Merge from master