fixes made by K1ll3rF0x
Merge pull request #17 from jmietola/dev

fixes made by K1ll3rF0x