tried to resolved issue # 50
Merge pull request #56 from tnguye91xula/issue50

tried to resolved issue # 50