Merge pull request #8 from dZ-Corp/master

progress