Fixed issue #163
Merge pull request #165 from simonser/master

Fixed issue #163