Fix #64
Merge pull request #65 from cbarrick/64

Fix #64