Resolved issue #28
Fixed issue #37