current with whats on github 1202014
Merge pull request #15 from schrockblock/feature/bmackall/uptodate1202014

current with whats on github 1202014