Bumping version to 0.2.4-snapshot
Merge remote-tracking branch 'origin/master'