New example file, squashed

The new example file including all modifications from #112