first commit
Merge https://github.com/pvmoura/simpleFramework