issue # 56
Merge pull request #68 from tnguye91xula/issue66

issue # 66