Bring in PR #68 from 0.1.3