Merge pull request #59 from mpeuster/master