Merge branch 'master' of github.com:sebmoocj/scarab