Merge branch 'release/0.2.4'
Merge tag '0.2.4' into develop

0.2.4