version 0.9
Merge branch 'version09'
Merge 0.9 to master