Added new paras for issue branch b0001.
Fixed the issue for b0002.
Finished adding paras for b0001.
Merge fix with b0001