Update external.py
Merge branches 'master' and 'dev'