fix all the things
Merge pull request #108 from taboularasa/master

fix all the things