Fixes issue #41.
Merge pull request #42 from joelgombin/master

Fixes issue #41.