Issue #31; Fixes #55