Added Comment field
Merge branch 'Daniel' into develop