Merge pull request #127 from hazendaz/master

More Code Quality Changes