Merge pull request #40 from stevebo/sprint2

steves newest version
Merge pull request #11 from itcc-li/sprint2

Merge pull request #40 from stevebo/sprint2