Slight enhancements
Merge branch 'master' of github.com:kberov/Ado