Merge pull request #5 from zetmw/dev

Dev