Merge pull request #1 from memect/master

sync