cache ip
Merge branch 'alpha0.3'
make update
Merge branch 'alpha0.3'