Few random fixes.
Merge pull request #12 from jesseniemisto/master

Few random fixes.