Some improvements
Merge branch 'master' of git@github.com:mikegostev/Commons.git