Fixes #18
Merge pull request #19 from jeremykendall/fix/18

Fixes #18
Merge branch 'develop'