fixing a load of bugs
Merge branch 'master' of https://github.com/antonioribeiro/core-libraries