Putting Derek's and shan's work together
Merge branch 'master' of https://github.com/redfern314/revv