Merge pull request #9 from JMtorii/master

Merging