Merge branches 'b_che1' and 'master'
Merge branches 'b_che1' and 'master' into b_che1
Merge branches 'master' and 'b_che1'
Merge branch 'master' of https://github.com/alicuche/nus
add demo 4