- adding the various changes from code inspection
Merge pull request #1 from gambol99/develop

- adding the various changes from code inspection