Fix lint issues and documentation
Merge branch 'develop'