Merge pull request #2 from xcvista/master

Update with master branch
3A23: Data URL processing done.
Merge pull request #2 from shisoft/master

Update with branch
Merge branch 'master' into osx-only