Fixed the imports bug with Nick
Merge pull request #851 from jaypoulz/hamster

Fixed the imports bug with Nick
Merge remote-tracking branch 'upstream/master' into goat