Different changes, fixes
Merge branch 'master' of github.com:bstrahija/gableci