Merged with my fork that added all the PEP8 and comments