initial commit of changes
Merge pull request #1 from drincruz/develop

initial commit of changes