Fix small bug with selected lines highlighting
Merge branch 'refs/heads/develop' into develop2
Fix pep8 errors