Merge pull request #53 from tobiasmuecksch/master

Implement enhancements demanded by nafergo