Fixes Issue #14
Merge pull request #15 from colettace/issue14

Fixes Issue #14