Improvements
'Minor' fixes
Merge pull request #2 from kankje/minor-fixes

Minor fixes