Merge pull request #11 from Edzelopez/4.4

GEP-6 Code cleanup for v4.4 compatibility
GEP-6 Additional bug fixes for 4.4