AS upgrades
Merge branch 'master' of github.com:NickStephens/lambda-x
AS modifications