Update Ruby version
Clean up and refactor
Fix regression in extended command set
Clean up and refactor specs