Handle Issue #7
Merge pull request #8 from randacc/master

Handle Issue #7