Merged with master.ls
Merged with master. Made pep8 fixes.