Merge pull request #29 from kotct/fixes

Merge branch 'fixes' into 'master'
Merge branch 'master' into fixes

This provides some updates, so the pull request will work nicely.