things coming along
Merge pull request #1 from ldemarest/master

things coming along