Play better with expanded snippets
Prepare 2.1.1 release