Patch 1

Issue #152