Bug fixes
Merge branch 'master' of github.com:joaocruz04/JUtils