issue # 57
Merge pull request #63 from tnguye91xula/issue57

issue # 57