small things
Merge branch 'master' of https://github.com/tblumras/production.git