Merge pull request #2 from s3rcan/master

sync with branch
Merge pull request #3 from s3rcan/sercan-for-sync-purpose

Merge pull request #2 from s3rcan/master