bug fixed
issue #32 fixed
Merge remote-tracking branch 'origin/beta' into beta