Set margin to 0 for maximum screen usage
Merge upstream
Fix what went wrong in merge
Better PEP8 conformance