update
Improved compatibility
Merge branch 'master' into chrome-app