Merge pull request #31 from JMtorii/master

Merging from master
Merge pull request #32 from JMtorii/dev

Merge pull request #31 from JMtorii/master