carousel fixed
merge from alex fixed
rspec codeclimate
before merging