Merge pull request #164 from mpeuster/master