bug fix, v1.1
pull from master and resolve conflict
fix filename
a little modify
resolve conflict
rm cache
commit before switch
add cache again
successs commit
add notes complete coding