wayne suggestion
Merge branch 'improve' of https://github.com/liqites/warehouse into improve