Refs #9 corrections entered to setup.py
Merge remote-tracking branch 'origin/feature/9_update_setup'