fixing borked merge
Merge pull request #12 from zetsubo/master

fixing borked merge