Merges changes from develop into master and fixes all pylint and pep8 errors