diff --git a/src/index.js b/src/index.js
index 1e9be2c..e02afcd 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,7 +4,7 @@ import React from "react"
 import ReactDOM from "react-dom"
 import { Provider } from "react-redux"
 import { createStore, applyMiddleware } from "redux"
-import { Router, Route, IndexRoute, hashHistory } from "react-router"
+import { Router, Route, IndexRoute, browserHistory } from "react-router"
 import createSagaMiddleware from "redux-saga"
 import reducer from "reducers"
 import saga from "sagas"
@@ -19,7 +19,7 @@ sagaMiddleware.run(saga)
 
 ReactDOM.render(
   <Provider store={store}>
-    <Router history={hashHistory}>
+    <Router history={browserHistory}>
       <Route path="/" component={LayoutContainer}>
         <IndexRoute component={TopPage} />
         <Route path="Hello/:name" component={HelloPage} />
diff --git a/src/server.js b/src/server.js
index 17336b1..1289d7b 100644
--- a/src/server.js
+++ b/src/server.js
@@ -11,7 +11,7 @@ var compiler = webpack(config)
 app.use(webpackDevMiddleware(compiler, { noInfo: true, publicPath: config.output.publicPath }))
 app.use(webpackHotMiddleware(compiler))
 
-app.get("/", function(req, res) {
+app.get("*", function(req, res) {
   res.sendFile(__dirname + '/index.html')
 })