diff --git a/README.md b/README.md
index 4ef6bbc9b..6dadf35be 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@
 * Works on
   * Web browsers (powered by [GopherJS](http://gopherjs.org/))
     * Supported browsers: Chrome and Firefox on desktops
+  * Windows
   * Mac OS X
   * Linux
-  * Windows
 
 ## Features
 
diff --git a/_docs/index.tmpl.html b/_docs/index.tmpl.html
index fe938a44e..c5fdb7698 100644
--- a/_docs/index.tmpl.html
+++ b/_docs/index.tmpl.html
@@ -32,12 +32,12 @@ pre {
           <li>Supported browsers: Chrome and Firefox on desktops</li>
         </ul>
       </li>
+      <li>Windows</li>
       <li>Mac OS X</li>
       <li>Linux</li>
-      <li>Windows</li>
     </ul>
   </li>
-  <li><a href="http://godoc.org/github.com/hajimehoshi/ebiten"><img src="https://godoc.org/github.com/hajimehoshi/ebiten?status.svg" alt="GoDoc"></a></li>
+  <li><a href="http://godoc.org/github.com/hajimehoshi/ebiten"><img src="https://godoc.org/github.com/hajimehoshi/ebiten?status.svg" alt="GoDoc Reference"></a></li>
   <li><a href="http://github.com/hajimehoshi/ebiten">GitHub project page</a> (Development version: v{{.DevVersion}})</li>
 </ul>
 
@@ -45,6 +45,7 @@ pre {
 <ul>
 <li>2D Graphics</li>
 <li>Input (Mouse, Keyboard, Gamepad)</li>
+<li>Audio (Ogg/Vorbis, WAV, and PCM)</li>
 </ul>
 
 <h2>Example</h2>
diff --git a/_docs/public/examples/audio.html b/_docs/public/examples/audio.html
index 61662be4e..1a35c56ad 100644
--- a/_docs/public/examples/audio.html
+++ b/_docs/public/examples/audio.html
@@ -205,9 +205,6 @@ func (p *Player) close() error {
 }
 
 func update(screen *ebiten.Image) error {
-    if err := audioContext.Update(); err != nil {
-        return err
-    }
     if musicPlayer == nil {
         select {
         case musicPlayer = &lt;-musicCh:
@@ -266,6 +263,9 @@ Press Z or X to change volume of the music
         msg &#43;= &#34;\nNow Loading...&#34;
     }
     ebitenutil.DebugPrint(screen, msg)
+    if err := audioContext.Update(); err != nil {
+        return err
+    }
     return nil
 }
 
diff --git a/_docs/public/examples/piano.html b/_docs/public/examples/piano.html
index ee457e149..0a9739a56 100644
--- a/_docs/public/examples/piano.html
+++ b/_docs/public/examples/piano.html
@@ -230,9 +230,6 @@ func init() {
 }
 
 func update(screen *ebiten.Image) error {
-    if err := audioContext.Update(); err != nil {
-        return err
-    }
     updateInput()
     for i, key := range keys {
         if keyStates[key] != 1 {
@@ -247,6 +244,10 @@ func update(screen *ebiten.Image) error {
     screen.DrawImage(imagePiano, nil)
 
     ebitenutil.DebugPrint(screen, fmt.Sprintf(&#34;FPS: %0.2f&#34;, ebiten.CurrentFPS()))
+
+    if err := audioContext.Update(); err != nil {
+        return err
+    }
     return nil
 }
 
diff --git a/_docs/public/index.html b/_docs/public/index.html
index c50ac314a..910d234eb 100644
--- a/_docs/public/index.html
+++ b/_docs/public/index.html
@@ -46,12 +46,12 @@ pre {
           <li>Supported browsers: Chrome and Firefox on desktops</li>
         </ul>
       </li>
+      <li>Windows</li>
       <li>Mac OS X</li>
       <li>Linux</li>
-      <li>Windows</li>
     </ul>
   </li>
-  <li><a href="http://godoc.org/github.com/hajimehoshi/ebiten"><img src="https://godoc.org/github.com/hajimehoshi/ebiten?status.svg" alt="GoDoc"></a></li>
+  <li><a href="http://godoc.org/github.com/hajimehoshi/ebiten"><img src="https://godoc.org/github.com/hajimehoshi/ebiten?status.svg" alt="GoDoc Reference"></a></li>
   <li><a href="http://github.com/hajimehoshi/ebiten">GitHub project page</a> (Development version: v1.3.0-alpha)</li>
 </ul>
 
@@ -59,6 +59,7 @@ pre {
 <ul>
 <li>2D Graphics</li>
 <li>Input (Mouse, Keyboard, Gamepad)</li>
+<li>Audio (Ogg/Vorbis, WAV, and PCM)</li>
 </ul>
 
 <h2>Example</h2>