ERP Bug fix 20082014
Merge pull request #34 from stanleyliu1006/master

ERP Bug fix 29082014