Merge branch 'master' into my_mac_use
Merge branch 'my_mac_use' of https://github.com/lindahua/julia into my_mac_use