added some comments
Merge branch 'mlj'
..