Lots of changes by Alberto and Elder.
Merge branch 'master' of github.com:bsommardahl/sauce