Merge pull request #35 from Jyrno42/master

fixes for code