version 0.9.4
Merge branch 'dev'