Merge pull request #2 from dZ-Corp/master

v3.0