Merge

Close task #126 .
Minor improvements.