Merge pull request #166 from stephenfin/bug/#94

- Fix #94
- Resolve #164