Fixes issue #40
Merge pull request #46 from myzsh/issue-40

Looks good.  Creating separate issues for testing that later to keep momentum going.
This fixes issue #36