changes for v06 ami
Merge branch 'master' of https://github.com/robertjparks/ogdev