Merge branch 'master' of github.com:digitalRoots/Middleman-Zerofour