Milestone-20130920
Merge https://github.com/emdyxf/comp-inv-1