Bug-Fixes.
Merge pull request #7 from tholzschuh/master

Merged Pull Request #7 @tholzschuh