Update Iss15 with master update from Issue #49