Merge pull request #5 from daugee/master

i think this will work