Fix documentation
Fix backwards compatibility
Merge pull request #565 from cmorty/pull/backwards

Fix backwards compatibility (and docs)