Merge pull request #33 from JMtorii/dev

Dev