tried to resolve issue # 30
Merge pull request #44 from tnguye91xula/issue30

tried to resolve issue # 30