Version 0.4.12
Merge branch 'v0.4'