Refs #9 corrections entered to setup.py
Merge branch 'feature/9_update_setup' into develop