Merge pull request #29 from olesalscheider/master