Getting ready for 1.6.2 commits
Refactoring to go to 1.6.2
Adding some utils