diff --git a/config.ini b/config.ini
index 1bca2dc1..d35aa258 100644
--- a/config.ini
+++ b/config.ini
@@ -1,8 +1,8 @@
 [General]
-DB_ROOT = 
-APP_DB_ROOT = 
-MAIN_DIR = 
-LOG_DIR = 
+DB_ROOT =
+APP_DB_ROOT =
+MAIN_DIR =
+LOG_DIR =
 PORT = 8083
 NEWEST_BOOKS = 60
 [Advanced]
diff --git a/config.ini_example b/config.ini_example
new file mode 100644
index 00000000..f1b18a87
--- /dev/null
+++ b/config.ini_example
@@ -0,0 +1,12 @@
+[General]
+DB_ROOT =
+APP_DB_ROOT =
+MAIN_DIR =
+LOG_DIR =
+PORT = 8083
+NEWEST_BOOKS = 60
+[Advanced]
+TITLE_REGEX = ^(A|The|An|Der|Die|Das|Den|Ein|Eine|Einen|Dem|Des|Einem|Eines)\s+
+DEVELOPMENT = 1
+PUBLIC_REG = 0
+UPLOADING = 1
diff --git a/cps/__init__.py b/cps/__init__.py
index 3a1213c8..faa18be5 100755
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -1,3 +1,2 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
diff --git a/cps/db.py b/cps/db.py
index b08592a1..2cebe7bf 100755
--- a/cps/db.py
+++ b/cps/db.py
@@ -7,6 +7,7 @@ from sqlalchemy.orm import *
 import os
 from cps import config
 import re
+import ast
 
 #calibre sort stuff
 title_pat = re.compile(config.TITLE_REGEX, re.IGNORECASE)
@@ -49,6 +50,25 @@ books_languages_link = Table('books_languages_link', Base.metadata,
     Column('lang_code', Integer, ForeignKey('languages.id'), primary_key=True)
     )
 
+cc = conn.execute("SELECT id, datatype FROM custom_columns")
+cc_ids = []
+cc_exceptions = ['bool', 'datetime', 'int', 'comments', 'float', ]
+books_custom_column_links = {}
+for row in cc:
+    if row.datatype not in cc_exceptions:
+        books_custom_column_links[row.id] = Table('books_custom_column_' + str(row.id) + '_link', Base.metadata,
+            Column('book', Integer, ForeignKey('books.id'), primary_key=True),
+            Column('value', Integer, ForeignKey('custom_column_' + str(row.id) + '.id'), primary_key=True)
+            )
+        #books_custom_column_links[row.id]=
+        cc_ids.append(row.id)
+
+cc_classes = {}
+for id in cc_ids:
+    ccdict={'__tablename__':'custom_column_' + str(id),
+        'id':Column(Integer, primary_key=True),
+        'value':Column(String)}
+    cc_classes[id] = type('Custom_Column_' + str(id), (Base,), ccdict)
 
 class Comments(Base):
     __tablename__ = 'comments'
@@ -152,7 +172,7 @@ class Data(Base):
 class Books(Base):
     __tablename__ = 'books'
 
-    id = Column(Integer,primary_key=True)
+    id = Column(Integer, primary_key=True)
     title = Column(String)
     sort = Column(String)
     author_sort = Column(String)
@@ -170,7 +190,7 @@ class Books(Base):
     series = relationship('Series', secondary=books_series_link, backref='books')
     ratings = relationship('Ratings', secondary=books_ratings_link, backref='books')
     languages = relationship('Languages', secondary=books_languages_link, backref='books')
-
+    
     def __init__(self, title, sort, author_sort, timestamp, pubdate, series_index, last_modified, path, has_cover, authors, tags):
         self.title = title
         self.sort = sort
@@ -184,8 +204,29 @@ class Books(Base):
 
     def __repr__(self):
         return u"<Books('{0},{1}{2}{3}{4}{5}{6}{7}{8}')>".format(self.title, self.sort, self.author_sort, self.timestamp, self.pubdate, self.series_index, self.last_modified ,self.path, self.has_cover)
+for id in cc_ids:
+    setattr(Books, 'custom_column_' + str(id), relationship(cc_classes[id], secondary=books_custom_column_links[id], backref='books'))
 
-Base.metadata.create_all(engine)
+class Custom_Columns(Base):
+    __tablename__ = 'custom_columns'
+    
+    id = Column(Integer,primary_key=True)
+    label = Column(String)
+    name = Column(String)
+    datatype = Column(String)
+    mark_for_delete = Column(Boolean)
+    editable = Column(Boolean)
+    display = Column(String)
+    is_multiple = Column(Boolean)
+    normalized = Column(Boolean)
+    
+    def get_display_dict(self):
+        display_dict = ast.literal_eval(self.display)
+        return display_dict
+
+#Base.metadata.create_all(engine)
 Session = sessionmaker()
 Session.configure(bind=engine)
 session = Session()
+
+
diff --git a/cps/helper.py b/cps/helper.py
index 7ac5532d..a101778f 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -199,3 +199,4 @@ def update_dir_stucture(book_id):
         os.renames(path, new_author_path)
         book.path = new_authordir + "/" + book.path.split("/")[1]
     db.session.commit()
+    
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index bcaad48a..b6d5018b 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -58,6 +58,27 @@
       </div>
       </p>
       {% endif %}
+      
+      {% if cc|length > 0 %}
+        <p>
+        <div class="custom_columns">
+        {% for c in cc %}
+          {% if entry['custom_column_' ~ c.id]|length > 0 %}
+            {{ c.name }}: 
+            {% for column in entry['custom_column_' ~ c.id] %}
+              {% if c.datatype == 'rating' %}
+                {{ '%d' % (column.value / 2) }}
+              {% else %}
+                {{ column.value }}
+              {% endif %}
+            {% endfor %}
+            <br />
+          {% endif %}
+        {% endfor %}
+        </div>
+        </p>
+      {% endif %}  
+        
 
       {% if entry.comments|length > 0 %}
         <h3>Description:</h3>
diff --git a/cps/templates/edit_book.html b/cps/templates/edit_book.html
index b4ec3661..2c7b8a37 100644
--- a/cps/templates/edit_book.html
+++ b/cps/templates/edit_book.html
@@ -37,12 +37,53 @@
       </div>
       <div class="form-group">
         <label for="rating">Rating</label>
-        <input type="text" class="form-control" name="rating" id="rating" value="{% if book.ratings %}{{book.ratings[0].rating}}{% endif %}">
+        <input type="number" min="1" max="5" step="1" class="form-control" name="rating" id="rating" value="{% if book.ratings %}{{book.ratings[0].rating / 2}}{% endif %}">
       </div>
       <div class="form-group">
         <label for="cover_url">Cover URL (jpg)</label>
         <input type="text" class="form-control" name="cover_url" id="cover_url" value="">
       </div>
+      {% if cc|length > 0 %}
+        {% for c in cc %}
+          <div class="form-group">
+            <label for="{{ 'custom_column_' ~ c.id }}">{{ c.name }}</label>
+            {% if c.datatype in ['text', 'series'] and not c.is_multiple %}
+              <input type="text" class="form-control" name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}"
+              {% if book['custom_column_' ~ c.id]|length > 0 %}
+                value="{{ book['custom_column_' ~ c.id][0].value }}"
+              {% endif %}>
+            {% endif %}
+
+            {% if c.datatype in ['text', 'series'] and c.is_multiple %}
+              <input type="text" class="form-control" name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}"
+              {% if book['custom_column_' ~ c.id]|length > 0 %}
+              value="{% for column in book['custom_column_' ~ c.id] %}{{ column.value.strip() }}{% if not loop.last %}, {% endif %}{% endfor %}"{% endif %}>
+            {% endif %}
+            
+            {% if c.datatype == 'enumeration' %}
+              <select class="form-control" name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}">
+                  <option></option>
+                  {% for opt in c.get_display_dict().enum_values %}
+                    <option 
+                      {% if book['custom_column_' ~ c.id]|length > 0 %}
+                        {% if book['custom_column_' ~ c.id][0].value == opt %}selected="selected"{% endif %}
+                      {% endif %}
+                      >{{ opt }}</option>
+                  {% endfor %}
+              </select>
+            {% endif %}
+            
+            {% if c.datatype == 'rating' %}
+              <input type="number" min="1" max="5" step="1" class="form-control" name="{{ 'custom_column_' ~ c.id }}" id="{{ 'custom_column_' ~ c.id }}"
+                {% if book['custom_column_' ~ c.id]|length > 0 %}
+                    value="{{ '%d' %  (book['custom_column_' ~ c.id][0].value / 2) }}"
+                {% endif %}>
+            {% endif %}
+          </div>
+        {% endfor %}
+      {% endif %}  
+      
+      
     <div class="checkbox">
       <label>
         <input name="detail_view" type="checkbox" checked> view book after edit
diff --git a/cps/web.py b/cps/web.py
index 28512c23..05a94793 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -316,11 +316,12 @@ def discover(page):
 @app.route("/book/<int:id>")
 def show_book(id):
     entries = db.session.query(db.Books).filter(db.Books.id == id).first()
+    cc = db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
     book_in_shelfs = []
     shelfs = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == id).all()
     for entry in shelfs:
         book_in_shelfs.append(entry.shelf)
-    return render_template('detail.html', entry=entries,  title=entries.title, books_shelfs=book_in_shelfs)
+    return render_template('detail.html', entry=entries,  cc=cc, title=entries.title, books_shelfs=book_in_shelfs)
 
 @app.route("/category")
 def category_list():
@@ -694,6 +695,7 @@ def edit_user(user_id):
 def edit_book(book_id):
     ## create the function for sorting...
     db.session.connection().connection.connection.create_function("title_sort",1,db.title_sort)
+    cc = db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
     book = db.session.query(db.Books).filter(db.Books.id == book_id).first()
     author_names = []
     for author in book.authors:
@@ -740,12 +742,12 @@ def edit_book(book_id):
         if len(add_authors) > 0:
             for add_author in add_authors:
                 # check if an author with that name exists
-                t_author = db.session.query(db.Authors).filter(db.Authors.name == add_author).first();
+                t_author = db.session.query(db.Authors).filter(db.Authors.name == add_author).first()
                 # if no author is found add it
                 if t_author == None:
                     new_author = db.Authors(add_author, add_author, "")
                     db.session.add(new_author)
-                    t_author = db.session.query(db.Authors).filter(db.Authors.name == add_author).first();
+                    t_author = db.session.query(db.Authors).filter(db.Authors.name == add_author).first()
                 # add author to book
                 book.authors.append(t_author)       
         if author0_before_edit != book.authors[0].name:
@@ -799,14 +801,14 @@ def edit_book(book_id):
         if len(add_tags) > 0:
             for add_tag in add_tags:
                 # check if a tag with that name exists
-                new_tag = db.session.query(db.Tags).filter(db.Tags.name == add_tag).first();
+                new_tag = db.session.query(db.Tags).filter(db.Tags.name == add_tag).first()
                 # if no tag is found add it
                 if new_tag == None:
                     new_tag = db.Tags(add_tag)
                     db.session.add(new_tag)
-                    new_tag = db.session.query(db.Tags).filter(db.Tags.name == add_tag).first();
+                    new_tag = db.session.query(db.Tags).filter(db.Tags.name == add_tag).first()
                 # add tag to book
-                book.tags.append(new_tag) 
+                book.tags.append(new_tag)
         
         if to_save["series"].strip():
             is_series = db.session.query(db.Series).filter(db.Series.name.like('%' + to_save["series"].strip() + '%')).first()
@@ -815,13 +817,107 @@ def edit_book(book_id):
             else:
                 new_series = db.Series(name=to_save["series"].strip(), sort=to_save["series"].strip())
                 book.series.append(new_series)
+        
         if to_save["rating"].strip():
-            is_rating = db.session.query(db.Ratings).filter(db.Ratings.rating == int(to_save["rating"].strip())).first()
-            if is_rating:
-                book.ratings[0] = is_rating
+            old_rating = False
+            if len(book.ratings) > 0:
+                old_rating = book.ratings[0].rating
+            ratingx2 = int(float(to_save["rating"]) *2)
+            print ratingx2
+            if ratingx2 != old_rating:
+                is_rating = db.session.query(db.Ratings).filter(db.Ratings.rating == ratingx2).first()
+                if is_rating:
+                    book.ratings.append(is_rating)
+                else:
+                    new_rating = db.Ratings(rating=ratingx2)
+                    book.ratings.append(new_rating)
+                if old_rating:
+                    book.ratings.remove(book.ratings[0])
+        else:
+            if len(book.ratings) > 0:
+                book.ratings.remove(book.ratings[0])
+                
+        
+        for c in cc:
+            cc_string = "custom_column_" + str(c.id)
+            if not c.is_multiple:
+                if len(getattr(book, cc_string)) > 0:
+                    cc_db_value = getattr(book, cc_string)[0].value
+                else:
+                    cc_db_value = None
+                if to_save[cc_string].strip():
+                    if c.datatype == 'rating':
+                        to_save[cc_string] = str(int(float(to_save[cc_string]) *2))
+                        print to_save[cc_string]
+                    if to_save[cc_string].strip() != cc_db_value:
+                        if cc_db_value != None:
+                            #remove old cc_val
+                            del_cc = getattr(book, cc_string)[0]
+                            getattr(book, cc_string).remove(del_cc)
+                            if len(del_cc.books) == 0:
+                                db.session.delete(del_cc)
+                        cc_class = db.cc_classes[c.id]
+                        new_cc = db.session.query(cc_class).filter(cc_class.value == to_save[cc_string].strip()).first()
+                        # if no cc val is found add it
+                        if new_cc == None:
+                            new_cc = cc_class(value=to_save[cc_string].strip())
+                            db.session.add(new_cc)
+                            new_cc = db.session.query(cc_class).filter(cc_class.value == to_save[cc_string].strip()).first()
+                        # add cc value to book
+                        getattr(book, cc_string).append(new_cc)
+                else:
+                    if cc_db_value != None:
+                        #remove old cc_val
+                        del_cc = getattr(book, cc_string)[0]
+                        getattr(book, cc_string).remove(del_cc)
+                        if len(del_cc.books) == 0:
+                            db.session.delete(del_cc)
             else:
-                new_rating = db.Ratings(rating=int(to_save["rating"].strip()))
-                book.ratings[0] = new_rating
+                input_tags = to_save[cc_string].split(',')
+                input_tags = map(lambda it: it.strip(), input_tags)
+                input_tags = [x for x in input_tags if x != '']
+                # we have all author names now
+                # 1. search for tags to remove
+                del_tags = []
+                for c_tag in getattr(book, cc_string):
+                    found = False
+                    for inp_tag in input_tags:
+                        if inp_tag == c_tag.value:
+                            found = True
+                            break;
+                    # if the tag was not found in the new list, add him to remove list
+                    if not found:
+                        del_tags.append(c_tag)
+                # 2. search for tags that need to be added
+                add_tags = []
+                for inp_tag in input_tags:
+                    found = False
+                    for c_tag in getattr(book, cc_string):
+                        if inp_tag == c_tag.value:
+                            found = True
+                            break;
+                    if not found:
+                        add_tags.append(inp_tag)
+                # if there are tags to remove, we remove them now
+                if len(del_tags) > 0:
+                    for del_tag in del_tags:
+                        getattr(book, cc_string).remove(del_tag)
+                        if len(del_tag.books) == 0:
+                            db.session.delete(del_tag)
+                # if there are tags to add, we add them now!
+                if len(add_tags) > 0:
+                    for add_tag in add_tags:
+                        # check if a tag with that name exists
+                        new_tag = db.session.query(db.cc_classes[c.id]).filter(db.cc_classes[c.id].value == add_tag).first()
+                        # if no tag is found add it
+                        if new_tag == None:
+                            print add_tag
+                            new_tag = db.cc_classes[c.id](value=add_tag)
+                            db.session.add(new_tag)
+                            new_tag = db.session.query(db.cc_classes[c.id]).filter(db.cc_classes[c.id].value == add_tag).first()
+                        # add tag to book
+                        getattr(book, cc_string).append(new_tag)
+
         db.session.commit()
         author_names = []
         for author in book.authors:
@@ -831,9 +927,9 @@ def edit_book(book_id):
         if "detail_view" in to_save:
             return redirect(url_for('show_book', id=book.id))
         else:
-            return render_template('edit_book.html', book=book, authors=author_names)
+            return render_template('edit_book.html', book=book, authors=author_names, cc=cc)
     else:
-        return render_template('edit_book.html', book=book, authors=author_names)
+        return render_template('edit_book.html', book=book, authors=author_names, cc=cc)
 
 @app.route("/upload", methods = ["GET", "POST"])
 @login_required
@@ -876,7 +972,6 @@ def upload():
         if fileextension.upper() == ".PDF":
             if use_generic_pdf_cover:
                 basedir = os.path.dirname(__file__)
-                print basedir
                 copyfile(os.path.join(basedir, "static/generic_cover.jpg"), os.path.join(filepath, "cover.jpg"))
             else:
                 with Image(filename=saved_filename + "[0]", resolution=150) as img:
@@ -889,11 +984,16 @@ def upload():
         else:
             db_author = db.Authors(author, "", "")
             db.session.add(db_author)
-        db_book = db.Books(title, "", "", datetime.datetime.now(), datetime.datetime(101, 01,01), 1, datetime.datetime.now(), author_dir + "/" + title_dir, has_cover, db_author, [])
+        path = os.path.join(author_dir, title_dir)
+        db_book = db.Books(title, "", "", datetime.datetime.now(), datetime.datetime(101, 01,01), 1, datetime.datetime.now(), path, has_cover, db_author, [])
         db_book.authors.append(db_author)
         db_data = db.Data(db_book, fileextension.upper()[1:], file_size, data_name)
         db_book.data.append(db_data)
         
         db.session.add(db_book)
         db.session.commit()
-    return render_template('edit_book.html', book=db_book)
+        author_names = []
+        for author in db_book.authors:
+            author_names.append(author.name)
+    cc = db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    return render_template('edit_book.html', book=db_book, authors=author_names, cc=cc)