Merge pull request #9 from yavorg/master

Renaming things and fixing #8 - Thank you!