include gilles .rb changes, update example templates