Merge pull request #1 from 3bot/master

Sync sources