Version 2.4
Merge branch 'master' of https://github.com/ivarcia/Barcia-Framework