version 0.2.4
Merge with v0.2.4 from master repository