Merge pull request #27 from gcborders/master

Merge pull request #26 from gcborders/jim_backup
Merge pull request #33 from gcborders/master

Pull in Master
Merge pull request #34 from gcborders/jim_backup

Pull Master