diff --git a/comic/migrations/0005_auto_20150625_1400.py b/comic/migrations/0005_auto_20150625_1400.py
new file mode 100644
index 0000000..85460b8
--- /dev/null
+++ b/comic/migrations/0005_auto_20150625_1400.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('comic', '0004_comicbook_unread'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ComicStatus',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('last_read_page', models.IntegerField()),
+                ('unread', models.BooleanField()),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='comicbook',
+            name='last_read_page',
+        ),
+        migrations.RemoveField(
+            model_name='comicbook',
+            name='unread',
+        ),
+        migrations.AddField(
+            model_name='comicstatus',
+            name='comic',
+            field=models.ForeignKey(to='comic.ComicBook'),
+        ),
+        migrations.AddField(
+            model_name='comicstatus',
+            name='user',
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/comic/migrations/0006_auto_20150625_1411.py b/comic/migrations/0006_auto_20150625_1411.py
new file mode 100644
index 0000000..58a9af6
--- /dev/null
+++ b/comic/migrations/0006_auto_20150625_1411.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comic', '0005_auto_20150625_1400'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='comicstatus',
+            name='last_read_page',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AlterField(
+            model_name='comicstatus',
+            name='unread',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/comic/migrations/0007_auto_20150626_1820.py b/comic/migrations/0007_auto_20150626_1820.py
new file mode 100644
index 0000000..10a9d1f
--- /dev/null
+++ b/comic/migrations/0007_auto_20150626_1820.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comic', '0006_auto_20150625_1411'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='setting',
+            name='name',
+            field=models.CharField(unique=True, max_length=100),
+        ),
+    ]
diff --git a/comic/models.py b/comic/models.py
index 0bf8d7b..678c4be 100644
--- a/comic/models.py
+++ b/comic/models.py
@@ -9,7 +9,7 @@ from os import path
 
 
 class Setting(models.Model):
-    name = models.CharField(max_length=50, unique=True)
+    name = models.CharField(max_length=100, unique=True)
     value = models.TextField()
 
     def __str__(self):
@@ -134,13 +134,19 @@ class ComicBook(models.Model):
         book.save()
         i = 0
         for f in sorted([str(x) for x in cbx.namelist()], key=str.lower):
-            ext = f.lower()[-3:]
+            try:
+                dot_index = f.rindex('.') + 1
+            except ValueError:
+                continue
+            ext = f.lower()[dot_index:]
+            print ext
             if ext in ['jpg', 'jpeg']:
                 page = ComicPage(Comic=book,
                                  index=i,
                                  page_file_name=f,
                                  content_type='image/jpeg')
                 page.save()
+
                 i += 1
             elif ext == 'png':
                 page = ComicPage(Comic=book,