Merge pull request #32 from WildCard65/stable

Integrated RTD
Fixes for recent PR