Merge pull request #1 from Trust1T/develop

Develop
final version 1.2.0