Issue 44

Fixes for Issue #44 and Issue #36