Feature/mod - Cleanspeak