fix presenter
fix
fix
Merge branch 'improve' of https://github.com/liqites/warehouse into improve
rspec
fix conflict