Non-conflicting merge
Merge pull request #22 from wolfe/a

aio-monitor: auto-merge