Closes #101 Closes #111
Merge branch 'master' of github.com:4Soft/Concreto