2.4 changes and fixes
Merge pull request #17 from Icehunter/2.4-fixes

2.4 changes and fixes