Updates from anitarf
Merge branch 'master' of https://github.com/nichol77/aware