using waitfg now
Merge branch 'master' of github.com:brockjw/a6
for antonio