dev-v1.0
Merge pull request #17 from shesheshe/4096

dev-v1.0