Fixes Issue #133
Merge pull request #136 from randacc/master

Fixes Issue #133