sphinx stuff
Merge pull request #159 from surchs/development

sphinx stuff