Spelling fixes and changes
Merge pull request #14 from Alydyn/local-dev

Spelling fixes and changes
removed unnecessary include
merge with development
Merge pull request #1 from meoz/master

update from original-development