Removed all import warnings
Merge remote-tracking branch 'origin/mitchellvitez'