fixes
Merge pull request #6 from samuelcouch/refactor

fixes