Merge pull request #528 from AartBluestoke/dev

New Features and bug-fixes
Added missing imports.
Merge remote-tracking branch 'upstream/MC-1.4' into dev