fix import
Merge pull request #43 from gpetretto/fixes

fix import
Merge remote-tracking branch 'upstream/master'