diff --git a/cmake/ModuleFilterFrame.cmake b/cmake/ModuleDefault.cmake
similarity index 78%
rename from cmake/ModuleFilterFrame.cmake
rename to cmake/ModuleDefault.cmake
index 0281056..3278bb7 100644
--- a/cmake/ModuleFilterFrame.cmake
+++ b/cmake/ModuleDefault.cmake
@@ -1,6 +1,7 @@
 ######################################################################################
-# Filter frame module
+# Default Modules
 ######################################################################################
 
 ADD_MODULE( FilterFrame "FilterFrame.cpp" )
+ADD_MODULE( MeasurePSNR "MeasurePSNR.cpp" )
 
diff --git a/source/modules/FilterFrame.cpp b/source/modules/FilterFrame.cpp
index e863bdc..28bfa49 100644
--- a/source/modules/FilterFrame.cpp
+++ b/source/modules/FilterFrame.cpp
@@ -41,6 +41,7 @@ PlaYUVerModuleDefinition FilterFrameDef = {
 FilterFrame::FilterFrame()
 {
   m_cModuleDef = FilterFrameDef;
+  m_pcFilteredFrame = NULL;
 }
 
 Void FilterFrame::create( PlaYUVerFrame* InputFrame )
diff --git a/source/modules/MeasurePSNR.cpp b/source/modules/MeasurePSNR.cpp
new file mode 100644
index 0000000..39779e9
--- /dev/null
+++ b/source/modules/MeasurePSNR.cpp
@@ -0,0 +1,69 @@
+/*    This file is a part of plaYUVer project
+ *    Copyright (C) 2014  by Luis Lucas      (luisfrlucas@gmail.com)
+ *                           Joao Carreira   (jfmcarreira@gmail.com)
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License along
+ *   with this program; if not, write to the Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * \file     MeasurePSNR.cpp
+ * \brief    Measure PSNR module
+ */
+
+#include <cstdio>
+
+#include "MeasurePSNR.h"
+#include "PlaYUVerFrame.h"
+
+namespace plaYUVer
+{
+
+static PlaYUVerModuleDefinition MeasurePSNRDef = {
+    FRAME_LEVEL_MODULE,
+    "Filters",
+    "Y_Filter",
+    "Filter Y matrix of YUV frame",
+    false,
+};
+
+MeasurePSNR::MeasurePSNR()
+{
+  m_pcFilteredFrame = NULL;
+  m_cModuleDef = MeasurePSNRDef;
+}
+
+Void MeasurePSNR::create( PlaYUVerFrame* InputFrame )
+{
+  m_pcFilteredFrame = NULL;
+  m_pcFilteredFrame = new PlaYUVerFrame( InputFrame->getWidth(), InputFrame->getHeight(), PlaYUVerFrame::GRAY );
+}
+
+PlaYUVerFrame* MeasurePSNR::process( PlaYUVerFrame* InputFrame )
+{
+  Pel*** pppOutputPelYUV = m_pcFilteredFrame->getPelBufferYUV();
+  Pel*** pppInputPelYUV = InputFrame->getPelBufferYUV();
+  memcpy( pppOutputPelYUV[LUMA][0], pppInputPelYUV[LUMA][0], m_pcFilteredFrame->getWidth() * m_pcFilteredFrame->getHeight() * sizeof(Pel) );
+  return m_pcFilteredFrame;
+}
+
+Void MeasurePSNR::destroy()
+{
+  if( m_pcFilteredFrame )
+    delete m_pcFilteredFrame;
+  m_pcFilteredFrame = NULL;
+}
+
+}  // NAMESPACE
+
diff --git a/source/modules/MeasurePSNR.h b/source/modules/MeasurePSNR.h
new file mode 100644
index 0000000..f3aaf4f
--- /dev/null
+++ b/source/modules/MeasurePSNR.h
@@ -0,0 +1,66 @@
+/*    This file is a part of plaYUVer project
+ *    Copyright (C) 2014  by Luis Lucas      (luisfrlucas@gmail.com)
+ *                           Joao Carreira   (jfmcarreira@gmail.com)
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License along
+ *   with this program; if not, write to the Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * \file     MeasurePSNR.h
+ * \brief    Measure PSNR module
+ */
+
+#ifndef __MEASUREPSNR_H__
+#define __MEASUREPSNR_H__
+
+#include "config.h"
+
+#include <iostream>
+#include <cstdio>
+#include "TypeDef.h"
+#include "PlaYUVerFrame.h"
+#include "PlaYUVerModuleIf.h"
+
+#include <cassert>
+
+namespace plaYUVer
+{
+
+class MeasurePSNR: public PlaYUVerModuleIf
+{
+private:
+  PlaYUVerFrame* m_pcFilteredFrame;
+
+public:
+  MeasurePSNR();
+  virtual ~MeasurePSNR()
+  {
+  }
+
+  Void create( PlaYUVerFrame* InputFrame );
+
+  PlaYUVerFrame* process( PlaYUVerFrame* InputFrame );
+  Void destroy();
+
+  PlaYUVerFrame* getModImage()
+  {
+    return m_pcFilteredFrame;
+  }
+};
+
+}  // NAMESPACE
+
+#endif // __MEASUREPSNR_H__
+