merge development branch

Probably a bad idea to reassign `@number` inside `to_s`