Patched issue #89

Implemented suggested fix in accordance with issue #89