Merge branch 'master' of github.com:barton-satchwill/barton.satchwill