Fix #40 and add missing documentation
Merge branch 'master' into release