Hopefully final version change
Merge pull request #4 from holytshirt/master

Hopefully final version change