initial
Merge https://github.com/AndyF/octoplus