Addressed issue #155

Patch for issue 155