Merge pull request #164 from mkalb/develop

Little fixes and enhancements