Merge tag 'Version_0.14' into develop

Version_0.14
Merge branch 'master' into develop
Changed setup.py file to allow actual setup
Merge branch 'release/Version_0.15'