Issue 346: bug fixed
Issue 360: feature added