Resolving Issue #115
Merge pull request #121 from ldidry/115

Resolving Issue #115