tried to resolved issue # 57
Merge pull request #61 from tnguye91xula/issue57

tried to resolved issue # 57