Fixes #6
Fixes #7
Missing parameters
Revert "Missing parameters"

This reverts commit 960c388c9d6369daf2def23a96946d5174c906a0.
Merge remote-tracking branch 'origin/development' into development