Missing imports
Tidy up
Merge pull request #8 from renclav/master

Missing imports