Fix issue #19
Merge pull request #20 from ScottPolhemus/master

Fix issue #19