bumbed version number
Merge branch 'release/0.12.4' into develop