diff --git a/build.gradle b/build.gradle
index 334072821..368aa997d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,9 +14,10 @@ buildscript {
             url 'https://maven.google.com/'
             name 'Google'
         }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
diff --git a/folioreader/res/values-ja/strings.xml b/folioreader/res/values-ja/strings.xml
new file mode 100644
index 000000000..6925e991d
--- /dev/null
+++ b/folioreader/res/values-ja/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">folioreader</string>
+    <string name="share">共有</string>
+    <string name="copy">コピー</string>
+    <string name="send_to">送信先：</string>
+    <string name="copied">コピーしました</string>
+    <string name="less_than_minute">1分未満 ·&#160;</string>
+    <string name="minutes_left">%1$d 分 ·&#160;</string>
+    <string name="minute_left">%1$d 分 ·&#160;</string>
+    <string name="highlight">ハイライト</string>
+    <string name="define">定義</string>
+    <string name="highlights">ハイライト</string>
+    <string name="style">スタイル</string>
+    <string name="Cancel">キャンセル</string>
+    <string name="loading">読み込み中</string>
+    <string name="please_wait">しばらくお待ちください</string>
+    <string name="edit_notes">編集</string>
+    <string name="save_note">保存</string>
+    <string name="please_enter_note">入力してください</string>
+    <string name="contents">目次</string>
+    <string name="dictionary">辞書</string>
+    <string name="cannot_access_epub_message">epubを開くことができません。ストレージアクセスが必要です !</string>
+    <string name="pages_left">残り %1$d ページ</string>
+    <string name="page_left">残り %1$d ページ</string>
+    <string name="change_Font">フォントの変更e</string>
+    <string name="change_Font_Color">フォント色</string>
+    <string name="changeStyle">スタイルの変更</string>
+    <string name="error_CannotChangeStyle">スタイルを変更できません!</string>
+    <string name="OK">Ok</string>
+    <string name="SetSizeTitle">上部パネルサイズ:</string>
+    <string name="LanguageChooserTitle">2つの言語を選択する:</string>
+    <string name="cant_open_file">このフィルは開けません。</string>
+</resources>
\ No newline at end of file
diff --git a/folioreader/res/values-pt-rBR/strings.xml b/folioreader/res/values-pt-rBR/strings.xml
index 47524d529..93a0f2f0d 100644
--- a/folioreader/res/values-pt-rBR/strings.xml
+++ b/folioreader/res/values-pt-rBR/strings.xml
@@ -30,4 +30,5 @@
     <string name="OK">Ok</string>
     <string name="SetSizeTitle">Painel superior</string>
     <string name="LanguageChooserTitle">Escolha 2 linguagens</string>
+    <string name="cant_open_file">Can\'t open file</string>
 </resources>
\ No newline at end of file
diff --git a/folioreader/res/values-ru/strings.xml b/folioreader/res/values-ru/strings.xml
index 764d690c2..79097c4be 100644
--- a/folioreader/res/values-ru/strings.xml
+++ b/folioreader/res/values-ru/strings.xml
@@ -41,5 +41,6 @@
     <string name="save_note">Сохранить заметку</string>
     <string name="please_enter_note">пожалуйста введите заметку</string>
     <string name="contents">Содержание</string>
+    <string name="cant_open_file">Can\'t open file</string>
 
 </resources>
diff --git a/folioreader/res/values/strings.xml b/folioreader/res/values/strings.xml
index 0ae3da5f8..a49008683 100644
--- a/folioreader/res/values/strings.xml
+++ b/folioreader/res/values/strings.xml
@@ -93,4 +93,5 @@
     <string name="cannot_access_epub_message">Cannot open epub it needs storage access !</string>
     <string name="orientation_horizontal">horizontal</string>
     <string name="orientation_vertical">vertical</string>
+    <string name="cant_open_file">Can\'t open file</string>
 </resources>
diff --git a/folioreader/src/main/java/com/folioreader/ui/folio/activity/FolioActivity.java b/folioreader/src/main/java/com/folioreader/ui/folio/activity/FolioActivity.java
index 07d57f19d..ae5b7c997 100644
--- a/folioreader/src/main/java/com/folioreader/ui/folio/activity/FolioActivity.java
+++ b/folioreader/src/main/java/com/folioreader/ui/folio/activity/FolioActivity.java
@@ -59,6 +59,9 @@
 import org.readium.r2_streamer.server.EpubServerSingleton;
 
 import java.io.IOException;
+import java.net.URLEncoder;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -131,7 +134,10 @@ protected void onCreate(Bundle savedInstanceState) {
         if (ContextCompat.checkSelfPermission(FolioActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
             ActivityCompat.requestPermissions(FolioActivity.this, Constants.getWriteExternalStoragePerms(), Constants.WRITE_EXTERNAL_STORAGE_REQUEST);
         } else {
-            setupBook();
+            if(setupBook() == false){
+                Toast.makeText(this, R.string.cant_open_file, Toast.LENGTH_LONG);
+                finish();
+            }
         }
 
         toolbar = findViewById(R.id.toolbar);
@@ -153,27 +159,52 @@ public void startContentHighlightActivity() {
         overridePendingTransition(R.anim.slide_in_up, R.anim.slide_out_up);
     }
 
-    private void initBook(String mEpubFileName, int mEpubRawId, String mEpubFilePath, EpubSourceType mEpubSourceType) {
+    private Boolean initBook(String mEpubFileName, int mEpubRawId, String mEpubFilePath, EpubSourceType mEpubSourceType) {
+        Log.v(TAG, "initBook >>");
+        Boolean result = false;
         try {
             int portNumber = getIntent().getIntExtra(Config.INTENT_PORT, Constants.PORT_NUMBER);
             mEpubServer = EpubServerSingleton.getEpubServerInstance(portNumber);
             mEpubServer.start();
             String path = FileUtil.saveEpubFileAndLoadLazyBook(FolioActivity.this, mEpubSourceType, mEpubFilePath,
                     mEpubRawId, mEpubFileName);
-            addEpub(path);
 
-            String urlString = Constants.LOCALHOST + bookFileName + "/manifest";
-            new MainPresenter(this).parseManifest(urlString);
+            if(addEpub(path)){
+
+                String urlString = Constants.LOCALHOST + URLEncoder.encode(bookFileName, "UTF-8") + "/manifest";
+                Log.v(TAG, "initBook urlString = " + urlString);
+                new MainPresenter(this).parseManifest(urlString);
 
+                result = true;
+            }
         } catch (IOException e) {
             Log.e(TAG, "initBook failed", e);
         }
+        Log.v(TAG, "initBook <<");
+
+        return result;
     }
 
-    private void addEpub(String path) throws IOException {
+    private Boolean addEpub(String path) throws IOException {
+        Log.v(TAG, "addEpub >>");
+        Log.v(TAG, "addEpub path = " + path);
+        Log.v(TAG, "addEpub bookFileName = " + bookFileName);
+
+        Boolean result = true;
+
         Container epubContainer = new EpubContainer(path);
-        mEpubServer.addEpub(epubContainer, "/" + bookFileName);
+        try{
+            mEpubServer.addEpub(epubContainer, "/" + URLEncoder.encode(bookFileName));
+        }
+        catch(Exception ex){
+            Log.e(TAG, "addEpub error = " +  ex.getMessage());
+            result = false;
+        }
         getEpubResource();
+
+        Log.v(TAG, "addEpub <<");
+
+        return result;
     }
 
     private void getEpubResource() {
@@ -369,15 +400,22 @@ public void onLoadPublication(EpubPublication publication) {
     }
 
     private void setConfig() {
-        if (AppUtil.getSavedConfig(this) != null) {
-            mConfig = AppUtil.getSavedConfig(this);
-        } else if (getIntent().getParcelableExtra(Config.INTENT_CONFIG) != null) {
+        Log.v(TAG, "setConfig >>");
+
+        Bundle args = getIntent().getExtras();
+        Log.v(TAG, "setConfig args = " + args.toString());
+
+        if (getIntent().getParcelableExtra(Config.INTENT_CONFIG) != null) {
             mConfig = getIntent().getParcelableExtra(Config.INTENT_CONFIG);
             AppUtil.saveConfig(this, mConfig);
+            Log.v(TAG, "setConfig (2) isShowTts = " + mConfig.isShowTts());
+        } else         if (AppUtil.getSavedConfig(this) != null) {
+            mConfig = AppUtil.getSavedConfig(this);
         } else {
             mConfig = new Config.ConfigBuilder().build();
             AppUtil.saveConfig(this, mConfig);
         }
+        Log.v(TAG, "setConfig <<");
     }
 
     @Override
@@ -394,9 +432,29 @@ public void pause() {
     public void onError() {
     }
 
-    private void setupBook() {
-        bookFileName = FileUtil.getEpubFilename(this, mEpubSourceType, mEpubFilePath, mEpubRawId);
-        initBook(bookFileName, mEpubRawId, mEpubFilePath, mEpubSourceType);
+    public String md5(String s) {
+        try {
+            // Create MD5 Hash
+            MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
+            digest.update(s.getBytes());
+            byte messageDigest[] = digest.digest();
+
+            // Create Hex String
+            StringBuffer hexString = new StringBuffer();
+            for (int i=0; i<messageDigest.length; i++)
+                hexString.append(String.format("%02x", messageDigest[i] & 0xff));
+            return hexString.toString();
+
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    private Boolean setupBook() {
+        //bookFileName = FileUtil.getEpubFilename(this, mEpubSourceType, mEpubFilePath, mEpubRawId);
+        bookFileName = md5(mEpubFilePath);
+        return initBook(bookFileName, mEpubRawId, mEpubFilePath, mEpubSourceType);
     }
 
     @Override
diff --git a/folioreader/src/main/java/com/folioreader/ui/folio/fragment/FolioPageFragment.java b/folioreader/src/main/java/com/folioreader/ui/folio/fragment/FolioPageFragment.java
index a02fe77ae..3a6e00a27 100644
--- a/folioreader/src/main/java/com/folioreader/ui/folio/fragment/FolioPageFragment.java
+++ b/folioreader/src/main/java/com/folioreader/ui/folio/fragment/FolioPageFragment.java
@@ -71,6 +71,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -209,6 +210,13 @@ public View onCreateView(LayoutInflater inflater,
 
 
     private String getWebviewUrl() {
+        //return Constants.LOCALHOST + mBookTitle + "/" + spineItem.href;
+        try{
+            return Constants.LOCALHOST + URLEncoder.encode(mBookTitle, "UTF-8") + "/" + spineItem.href;
+        }
+        catch (Exception ex){
+
+        }
         return Constants.LOCALHOST + mBookTitle + "/" + spineItem.href;
     }
 
@@ -227,7 +235,7 @@ public void onConfigurationChanged(Configuration newConfig) {
 
     /**
      * [EVENT BUS FUNCTION]
-     * Function triggered from {@link FolioActivity#initAudioView()} when pause/play
+     * Function triggered from {@link FolioActivity} when pause/play
      * button is clicked
      *
      * @param event of type {@link MediaOverlayPlayPauseEvent} contains if paused/played
@@ -368,8 +376,17 @@ private void setHtml(boolean reloaded) {
             if (forwardSlashLastIndex != -1)
                 path = ref.substring(0, forwardSlashLastIndex + 1);
 
+            String title;
+            try{
+                title = URLEncoder.encode(mBookTitle, "UTF-8");
+            }
+            catch(Exception ex){
+                title = mBookTitle;
+            }
+
             mWebview.loadDataWithBaseURL(
-                    Constants.LOCALHOST + mBookTitle + "/" + path,
+                    // Constants.LOCALHOST + mBookTitle + "/" + path,
+                    Constants.LOCALHOST + title + "/" + path,
                     HtmlUtil.getHtmlContent(getActivity(), mHtmlString, mConfig),
                     "text/html",
                     "UTF-8",
diff --git a/folioreader/src/main/java/com/folioreader/ui/tableofcontents/view/TableOfContentFragment.java b/folioreader/src/main/java/com/folioreader/ui/tableofcontents/view/TableOfContentFragment.java
index c9a63b5fa..0b32ea3a1 100644
--- a/folioreader/src/main/java/com/folioreader/ui/tableofcontents/view/TableOfContentFragment.java
+++ b/folioreader/src/main/java/com/folioreader/ui/tableofcontents/view/TableOfContentFragment.java
@@ -23,6 +23,7 @@
 import com.folioreader.ui.tableofcontents.presenter.TableOfContentsPresenter;
 import com.folioreader.util.AppUtil;
 
+import java.net.URLEncoder;
 import java.util.ArrayList;
 
 import static com.folioreader.Constants.BOOK_TITLE;
@@ -72,7 +73,15 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         mTableOfContentsRecyclerView = (RecyclerView) view.findViewById(R.id.recycler_view_menu);
         errorView = (TextView) view.findViewById(R.id.tv_error);
-        String urlString = Constants.LOCALHOST + mBookTitle + "/manifest";
+
+        String bookTitle;
+        try{
+            bookTitle = URLEncoder.encode(mBookTitle, "UTF-8");
+        }
+        catch(Exception ex){
+            bookTitle = mBookTitle;
+        }
+        String urlString = Constants.LOCALHOST + bookTitle + "/manifest";
 
         configRecyclerViews();
         presenter.getTOCContent(urlString);
diff --git a/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java b/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java
index 4a98f319b..4021ed127 100644
--- a/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java
+++ b/sample/src/main/java/com/folioreader/android/sample/HomeActivity.java
@@ -66,7 +66,7 @@ public void onClick(View v) {
         findViewById(R.id.btn_assest).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                folioReader.openBook("file:///android_asset/TheSilverChair.epub");
+                folioReader.openBook("file:///android_asset/jpn.epub");
             }
         });