sprint 3
Merge pull request #85 from Chucksta/master

sprint 3