4.3 Code cleanup and bug fixes
Merge pull request #7 from Edzelopez/4.3

4.3 Code cleanup and bug fixes