Merge pull request #9 from JMtorii/master

Merging
Merge pull request #10 from JMtorii/test

Merge pull request #9 from JMtorii/master