Rel 1.0.5

make it compatible to current master code.