pls fixit
Merge pull request #49 from kereru-2014/fixit

pls fixit