Merge pull request #1 from nylira/master

sync