This should catch all import add/updates.
Merge pull request #340 from Jedwondle/master

This should catch all import add/updates.