Fixes issue #196
Merge pull request #203 from fluxtah/master

Fixes issue #196