fix bug (issues #80)
Merge pull request #81 from skaic/master

fix bug (issues #80)