Merge pull request #138 from tannn/testing

Testing to Master
Merge pull request #139 from tannn/master

Merge pull request #138 from tannn/testing