v2.4
Merge pull request #7 from rostikoff/feature

v2.4