Resolves Issue #74
Merge pull request #122 from derks/issue74

Resolves Issue #74 - Redo