Merge pull request #1 from ivuk/master

Some minor cleanups