Actually update the documentation too (STOX-42)
Merge pull request #11 from stoxy/stox-42

Actually update the documentation too (STOX-42)
Merge branch 'master' into stox-31