fix everything, closes #1
Merge pull request #2 from tomjakubowski/fix1

fix everything, closes #1