Fixing issue #4
Updates based on feedback from Jerome
Merge pull request #5 from vad710/master

Fixing issue #4