Fix #23 import issue
Fix more missing import fixing
Merge pull request #30 from victorlin/fix-import-issue

Fix #23 import issue

+1, @victorlin can you branch into victor, merge into develop (ill branch into parham, merge into develop as well) and then we'll do a periodic merge into master