Fixed imports and various syntax errors
Merge pull request #1 from 2insanepeople/patch-1

Fixed imports and various syntax errors