inspirit Merge pull request #44 from mkalten/master