tried to resolve issue25
Merge pull request #35 from tnguye91xula/issue25

tried to resolve issue #25