Merge pull request #1 from ocornut/master

Merge