Fix Issue #13.
Merge pull request #36 from gudnm/master

Fixes issue #13.