Fix readthedocs
Merge branch '0.3'