Fix import errors
Merge pull request #2 from WnP/master

Fix import errors