modified setup.py and marina.py in-accordance with PEP-8.
Merge remote-tracking branch 'origin/master'