fixing last commit
Merge branch 'master' of github.com:sebastiansen/rip