Merge CodeSleeve into my fork

Merge CodeSleeve into my fork