Merge branch 'hotfix-0.1.2'
Merge branch 'feature-34' of https://github.com/dgaubert/mammoth into feature-34
Feature #34, green test