Added comments for the constructor
Merge branch 'fix-exman' into develop