Fixing issue#2
Merge pull request #3 from martingust/issue#2

Fixing issue#2