State machine 3 - reparar rspec
Merge branch 'master' into sample_states