Merge branch 'feature/issue-218/sphinx' of https://github.com/childmi…

Merge branch 'feature/issue-218/sphinx' of https://github.com/childmi… #106