Initial code
Merge pull request #1 from luiweb/develop

Updated the first code