diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cfe9d8c..ddf9e871 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
Changelog for Redmine DMSF
==========================
-1.6.0 *2017-09-04*
+1.6.0 *2017-09-12*
------------------
Folder permissions
diff --git a/app/views/dmsf/_custom_fields.html.erb b/app/views/dmsf/_custom_fields.html.erb
index 6e5ab581..56a3f052 100644
--- a/app/views/dmsf/_custom_fields.html.erb
+++ b/app/views/dmsf/_custom_fields.html.erb
@@ -19,7 +19,8 @@
#
# 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.%>
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+%>
<% if object %>
diff --git a/app/views/dmsf_workflows/log.html.erb b/app/views/dmsf_workflows/log.html.erb
index 69f759cd..36b52321 100644
--- a/app/views/dmsf_workflows/log.html.erb
+++ b/app/views/dmsf_workflows/log.html.erb
@@ -3,7 +3,7 @@
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-17 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/views/dmsf_workflows/remove_step.html.erb b/app/views/dmsf_workflows/remove_step.html.erb
index d52ac993..1a7f696d 100644
--- a/app/views/dmsf_workflows/remove_step.html.erb
+++ b/app/views/dmsf_workflows/remove_step.html.erb
@@ -1,6 +1,9 @@
-<%# Redmine plugin for Document Management System "Features"
+<%
+# encoding: utf-8
#
-# Copyright (C) 2013 Karel Pičman
+# Redmine plugin for Document Management System "Features"
+#
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -14,6 +17,7 @@
#
# 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.%>
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+%>
<%= render 'steps' %>
\ No newline at end of file
diff --git a/app/views/dmsf_workflows/show.html.erb b/app/views/dmsf_workflows/show.html.erb
index d52ac993..218f4b55 100644
--- a/app/views/dmsf_workflows/show.html.erb
+++ b/app/views/dmsf_workflows/show.html.erb
@@ -1,6 +1,8 @@
-<%# Redmine plugin for Document Management System "Features"
+<%
+# encoding: utf-8
+# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2013 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -14,6 +16,7 @@
#
# 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.%>
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+%>
-<%= render 'steps' %>
\ No newline at end of file
+<%= render 'steps' %>
diff --git a/db/migrate/20120822100401_create_dmsf_workflows.rb b/db/migrate/20120822100401_create_dmsf_workflows.rb
index bd35ae63..672866b7 100644
--- a/db/migrate/20120822100401_create_dmsf_workflows.rb
+++ b/db/migrate/20120822100401_create_dmsf_workflows.rb
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/db/migrate/20120822100403_create_dmsf_workflow_step_assignments.rb b/db/migrate/20120822100403_create_dmsf_workflow_step_assignments.rb
index f51b37c1..17a61dcb 100644
--- a/db/migrate/20120822100403_create_dmsf_workflow_step_assignments.rb
+++ b/db/migrate/20120822100403_create_dmsf_workflow_step_assignments.rb
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/db/migrate/20130819013955_update_projects.rb b/db/migrate/20130819013955_update_projects.rb
index f4f5be61..b97312bf 100644
--- a/db/migrate/20130819013955_update_projects.rb
+++ b/db/migrate/20130819013955_update_projects.rb
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/db/migrate/20131108141401_add_index_to_dmsf_files.rb b/db/migrate/20131108141401_add_index_to_dmsf_files.rb
index d9958433..96b4ed95 100644
--- a/db/migrate/20131108141401_add_index_to_dmsf_files.rb
+++ b/db/migrate/20131108141401_add_index_to_dmsf_files.rb
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/db/migrate/20131108141402_add_index_to_dmsf_folders.rb b/db/migrate/20131108141402_add_index_to_dmsf_folders.rb
index 8ed8b912..da363a2b 100644
--- a/db/migrate/20131108141402_add_index_to_dmsf_folders.rb
+++ b/db/migrate/20131108141402_add_index_to_dmsf_folders.rb
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/db/migrate/20131113141401_add_index_to_dmsf_file_revision.rb b/db/migrate/20131113141401_add_index_to_dmsf_file_revision.rb
index e8e0b029..7550f786 100644
--- a/db/migrate/20131113141401_add_index_to_dmsf_file_revision.rb
+++ b/db/migrate/20131113141401_add_index_to_dmsf_file_revision.rb
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/db/migrate/20141015132701_remove_folder_from_revision.rb b/db/migrate/20141015132701_remove_folder_from_revision.rb
index ed512750..e2ff8485 100644
--- a/db/migrate/20141015132701_remove_folder_from_revision.rb
+++ b/db/migrate/20141015132701_remove_folder_from_revision.rb
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/db/migrate/20150120152101_notifications_nullable.rb b/db/migrate/20150120152101_notifications_nullable.rb
index ff835e78..3f6c5719 100644
--- a/db/migrate/20150120152101_notifications_nullable.rb
+++ b/db/migrate/20150120152101_notifications_nullable.rb
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/db/migrate/20150910153701_title_not_null.rb b/db/migrate/20150910153701_title_not_null.rb
index a91be7fd..3fad2193 100644
--- a/db/migrate/20150910153701_title_not_null.rb
+++ b/db/migrate/20150910153701_title_not_null.rb
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/dmsf_user_guide.odt b/dmsf_user_guide.odt
index 9945c781..bd06dc40 100644
Binary files a/dmsf_user_guide.odt and b/dmsf_user_guide.odt differ
diff --git a/extra/api/api_client.sh b/extra/api/api_client.sh
index 7c90206d..ef95c74e 100644
--- a/extra/api/api_client.sh
+++ b/extra/api/api_client.sh
@@ -2,7 +2,7 @@
#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-15 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/extra/xapian_indexer.rb b/extra/xapian_indexer.rb
index e7280dfd..df65fe7e 100644
--- a/extra/xapian_indexer.rb
+++ b/extra/xapian_indexer.rb
@@ -4,8 +4,8 @@
#
# Redmine Xapian is a Redmine plugin to allow attachments searches by content.
#
-# Copyright (C) 2010 Xabier Elkano
-# Copyright (C) 2015 Karel Pičman
+# Copyright (C) 2010 Xabier Elkano
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine_dmsf/patches/attachable_patch.rb b/lib/redmine_dmsf/patches/attachable_patch.rb
index bdc4867e..4a3b2a63 100644
--- a/lib/redmine_dmsf/patches/attachable_patch.rb
+++ b/lib/redmine_dmsf/patches/attachable_patch.rb
@@ -1,6 +1,8 @@
+# encoding: utf-8
+#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2011-17 Karel Pičman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/fixtures/custom_fields.yml b/test/fixtures/custom_fields.yml
index 712078d5..6376347d 100644
--- a/test/fixtures/custom_fields.yml
+++ b/test/fixtures/custom_fields.yml
@@ -1,6 +1,8 @@
+# encoding: utf-8
+#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2013 Karel Picman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/fixtures/custom_values.yml b/test/fixtures/custom_values.yml
index 4858d7e1..22aba565 100644
--- a/test/fixtures/custom_values.yml
+++ b/test/fixtures/custom_values.yml
@@ -1,6 +1,8 @@
+# encoding: utf-8
+#
# Redmine plugin for Document Management System "Features"
#
-# Copyright (C) 2013 Karel Picman
+# Copyright (C) 2011-17 Karel Picman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3274dc6c..2e592517 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,8 +1,10 @@
+# encoding: utf-8
+#
# Redmine plugin for Document Management System "Features"
#
# Copyright (C) 2011 Vít Jonáš
# Copyright (C) 2012 Daniel Munn
-# Copyright (C) 2011-14 Karel Picman
+# Copyright (C) 2011-17 Karel Pičman
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License