Fixing master - just a couple of missing imports
Merge pull request #641 from jtorrente/fix-master

Fixing master - just a couple of missing imports