Merge branch 'Rudy'
Merge branch 'Rudy'
change entity rspec
Merge branch 'master' into Rudy