restored original code snippets and commit references as for #50