0.6.1.17 - some comments clean