Merge pull request #3 from enuilin/master

Merge things