Fixing bug #151
Merge pull request #154 from Jako/upstream

Fixing bug #151