Merge pull request #2 from andersonkmi/develop

Develop
Merge pull request #3 from andersonkmi/develop

Changes
Merge pull request #4 from andersonkmi/develop

Few modifications
Initial unit-test commit
Merge pull request #11 from andersonkmi/master

Merge