Merge pull request #2

Sync with master