fixes/enhancements for PR #323

- fix merge conflict with develop
- add missing dependencies
- style fixes