Merge pull request #23 from johncosta/johns-dev

latest set of changes that includes lots of great goodies
Merge branch 'johns-dev'