minor changes before Kyle's commit
Merge branch 'master' of https://github.com/ksshannon/rxcadre