updated after testing
Merge branch 'master' of github.com:peter1010/cd_rip