scaled down
Merge branch 'master' of github.com:dkapila/aurora