Bug #46
Issue #63