Merge pull request #297 from scrollback/smallfixes

Smallfixes
Merge branch 'master' into smallfixes