various updates
Merge branch 'master' of https://github.com/kartoone/Salvatores.git