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

Version 0.2.4