Merge pull request #1 from SthephanShinkufag/master

Sync