Lots and lots of updates, correction, bugfixes, improvements, etc...
Merge branch 'master' of https://github.com/jorgepinho/Maktaba

update locally