BS 140909 fixbug 41,42
[09092014]-Thien finished merge bs135