Few modifications
Merge pull request #4 from andersonkmi/develop

Few modifications