Fixes, merges, new functionality
Merge pull request #44 from erwinvanhunen/fixes

Fixes, merges, new functionality