Merge pull request #94 from mwbutcher/master

++1