Some Changes and Patches. See MergeComment for details
Merge pull request #5 from JanHorak/SomePatches

Some Changes and Patches. See MergeComment for details