diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f0c574c9d0f4296a9c5fc15b43dd237ab1cdfe76..3db06e46222025221271cb49ff41cf8d14a01202 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,7 @@ FIND_PACKAGE ( Qt4 REQUIRED )
 
 INCLUDE ( KDE4Defaults )
 
-set(GENERIC_LIB_VERSION "1.0.2")
+set(GENERIC_LIB_VERSION "1.1.0")
 
 INCLUDE_DIRECTORIES ( ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
 
diff --git a/src/Call.cpp b/src/Call.cpp
index d700174dda1cbecba349c2566486c3d942a90eda..223bb0706ee3ea48dc282718db565aabb10b2257 100644
--- a/src/Call.cpp
+++ b/src/Call.cpp
@@ -625,7 +625,7 @@ void Call::call()
    qDebug() << "account = " << m_Account;
    if(m_Account.isEmpty()) {
       qDebug() << "Account is not set, taking the first registered.";
-      this->m_Account = CallModelConvenience::getCurrentAccountId();
+      this->m_Account = CallModel<>::getCurrentAccountId();
    }
    if(!m_Account.isEmpty()) {
       qDebug() << "Calling " << m_CallNumber << " with account " << m_Account << ". callId : " << m_CallId;
diff --git a/src/CallModel.h b/src/CallModel.h
index 3346f93d6c3921466fda1f999ee6f14150436004..ae19567b0c0fafd667a57f5cc60d959daff8309f 100644
--- a/src/CallModel.h
+++ b/src/CallModel.h
@@ -23,6 +23,8 @@
 
 #include <QObject>
 #include <QVector>
+#include <QWidget>
+#include <QModelIndex>
 #include <QMap>
 #include "typedefs.h"
 
@@ -86,7 +88,7 @@ signals:
  *  solution may be less "clean" than MVC, but is 3 time smaller and easier to improve (in fact, possible to improve).      
  */
 ///@class CallModel Central model/frontend to deal with sflphoned
-template  <typename CallWidget, typename Index>
+template  <typename CallWidget = QWidget*, typename Index = QModelIndex*>
 class LIB_EXPORT CallModel : public CallModelBase {
    public:
       enum ModelType {
@@ -212,11 +214,11 @@ class LIB_EXPORT CallModel : public CallModelBase {
       bool  updateCommon (Call* call);
 };
 
-class CallModelConvenience : public CallModel<QWidget*,QModelIndex*>
+/*class CallModelConvenience : public CallModel<QWidget*,QModelIndex*>
 {
    public:
       CallModelConvenience(ModelType type) : CallModel<QWidget*,QModelIndex*>(type) {}
-};
+};*/
 
 #include "CallModel.hpp"
 
diff --git a/src/Contact.cpp b/src/Contact.cpp
index 6aa277e09460954b5434c8601b509327a19e213e..bc64c91e69fffad8b49cef54460f5efd63ac1067 100644
--- a/src/Contact.cpp
+++ b/src/Contact.cpp
@@ -150,7 +150,7 @@ void Contact::setFamilyName(const QString& name)
 ///Set the Photo/Avatar
 void Contact::setPhoto(QPixmap* photo)
 {
-   m_pPhoto      = photo;
+   m_pPhoto = photo;
 }
 
 ///Set the formatted name (display name)