Merge pull request #56 from mpeuster/master