Merge pull request #77 from mpeuster/master