did some stuff refs #3
did some stuff refs #6
Merge branch 'master' of https://github.com/mbathie/mbtestpublic
did some stuff refs #6