Merge pull request #1 from wandoulabs/master

Upstream changes