Added missing dependencies and version constraints
Merge pull request #2222 from mmottl/master

Added missing dependencies and version constraints