Fixed Issue #6
Merge pull request #8 from abusalam/issue#6

Fixed Issue #6