fixed issue #29
Merge pull request #34 from tnguye91xula/issue29

fixed issue #29