issue#32

This is to #32 , and will work after merge my previous pull request in issue #30