changed constructor architecture to be more consistent
Merge remote-tracking branch 'origin/development' into development