Merge pull request #105 from schumy21/master

merge
Merge pull request #106 from schumy21/master

Sch12112012
Merge pull request #8 from rockamorales/master

Modificaciones Schumy
Merge pull request #107 from mackk/master

merge
Merge pull request #8 from rockamorales/master

Roberto