Merge pull request #1 from littlebeanfang/master

Bean created a big update.