version 0.09, improvements
Merge branch 'version-0.09'