For the modules/__init__.py, fixes from Issue #792

proposed by @userclandestine