Merge pull request #1349 from lukeis/master

fixing imports