Small Changes and Fixes

Check for empty input etc.
Merge pull request #21 from broggi/master

Small Changes and Fixes