Fix import issues
Merge pull request #48 from novoda/import-project-fix

Fix import issues