tried to resolved issue # 40
Merge pull request #46 from tnguye91xula/issue40

tried to resolved issue # 40