Merge pull request #38 from tbuchanan/master

pull request
merged pull request
commit after group master pull