Merge tag 'Version_0.15' into develop

Version_0.15
Merge branch 'master' into develop
Added additional files to setup.py
Merge branch 'release/Version_0.16'