Little fixes
Merge pull request #78 from mkalb/littleFixes

Little fixes