Merge pull request #31 from JMtorii/master

Merging from master