Some performance enhancements
Bumped version number to 0.2.4
Merge branch 'release-0.2.4' into develop