resolved issue#256
Merge pull request #257 from kevin000/issue#181

resolved issue#256