Merge pull request #115 from mmunz/master