Modified for bashrc.sh
Merge branch 'master' of https://github.com/jolin90/jolin