Merge branch 'hotfix/update-version-package-json' into develop
Updated .gitignore.
Merge branch 'hotfix/allow-overwrite-params' into develop
Merge branch 'master' into develop

# By Martin Holman (1) and Philipp Nolte (1)
# Via Philipp Nolte (2) and Philipp (1)
* master:
  Bumped version number, updated readme and configured gitflow.
  use the provided param names
Fixed typo in Readme.