some pep8, docstring added instead of comments
pull before merge