Implemented/Fixed charlesportwoodii/ciims GH #125