Fixes #14
Merge pull request #24 from jcgharvey/I14

Fixes #14