Merge pull request #2 from arteria/master

Sync source