notes by mishra
Merge branch 'master' of github.com:pvtech/da_feng_rice

This commit merges dafeng and mishra's work