Merge pull request #168 from mpeuster/master