tried to solve issue #33
Merge pull request #41 from tnguye91xula/issue33

tried to solve issue #33