Merge pull request #40 from stevebo/sprint2

steves newest version