take care of issue #33 (tested locally
Merge pull request #47 from cd34/master

fix issue #33