Merge pull request #18 from parrt/master

fix imports