fixing issue #5
Merge pull request #11 from tkrille/master

fixing issue #5