0.2-4 Upgrade
Merge pull request #1 from bauman/2.4-release

0.2-4 Upgrade