tried to resolved issue # 36
Merge pull request #48 from tnguye91xula/issue36

tried to resolved issue # 36