code review
update git ignore
Merge branch 'feature/code-review' into develop