Merge pull request #43 from Windower/master

Sync