Version 1.0
Merge pull request #2 from qiriga/master

Version 1.0 [From Han]