Merge pull request #8 from mlhim/master

Preparing for 2.4.5
Cleanup preparing for 2.4.5
Merge pull request #10 from mlhim/2_4_4

Cleanup and preparing for 2.4.5