incluindo pre registro
Merge branch 'master' of https://github.com/AwareTI/SMM