JW - Updates
Merge branch 'master' of https://github.com/nibbs/Rip