Fixed issue #118
Merge pull request #154 from gideonthomas/issue118

Fixed issue #118