fixing issue #40
Merge pull request #2 from Jako/master

Pull: fixing issue #40