More admiral
Merge branch 'master' of github.com:wballard/starphleet