Merge pull request #45 from mpeuster/master