Merge branch 'unstable'
clarify documentation
Merge branch 'master' into unstable
cleanup codebase