changes for david binetti. This is the final product
Merge pull request #2 from EntilZha/dev

Merging contractor work