new commit
Merge branch 'scott'
bug fix for add_alias