Commit pollmaster-wip at 0.1.2