Merge pull request #2 from s3rcan/master

sync with branch