Fixed typos and transposed variables
Merge pull request #1 from helicomatic/master

Fixed linux support, typos.