Merge pull request #1 from urho3d/master

Merge with urho3d:master