Add import declarations for issue 313 & 314
Merge pull request #1811 from 9rnsr/fix_imports

Add import declarations for issue 313 & 314
fix conflict manually