Improved documentation
Merge branch 'master' into 0.2.x