Fixing number of minor issues
Merge pull request #1222 from alterm4nn/minorfixes

Fixing number of minor issues