Merge branch 'dev'
Merge branch 'dev', fixed readme
0.04 small fixes