fixed merge comments from monicao
Merge branch 'fix/controllers' into develop