Merge pull request #162 from mpeuster/master