Challenge 2972 requirements fulfilled
Merge branch 'master' of https://github.com/cloudspokes/thurgood