diff --git a/dev/tests/conf/local.conf b/dev/tests/conf/local.conf
index f8950ed..d09ba9c 100644
--- a/dev/tests/conf/local.conf
+++ b/dev/tests/conf/local.conf
@@ -2,7 +2,7 @@
 
 ###### osync - Rsync based two way sync engine with fault tolerance
 ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr)
-###### osync v1.1x / v1.2x config file rev 2016102101
+###### osync v1.1x / v1.2x config file rev 2017060501
 
 ## ---------- GENERAL OPTIONS
 
@@ -23,6 +23,9 @@ SSH_RSA_PRIVATE_KEY="/home/backupuser/.ssh/id_rsa"
 ## Alternatively, you may specify an SSH password file (less secure). Needs sshpass utility installed.
 SSH_PASSWORD_FILE=""
 
+## When using ssh filter, you must specify a remote token matching the one setup in authorized_keys
+_REMOTE_TOKEN=SomeAlphaNumericToken9
+
 ## Create sync directories if they do not exist
 CREATE_DIRS=no
 
@@ -79,6 +82,11 @@ REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.com"
 
 ## ---------- MISC OPTIONS
 
+## Optional arguments passed to rsync executable. The following are already managed by the program and shoul never be passed here
+## -r -l -p -t -g -o -D -E - u- i- n --executability -A -X -L -K -H -8 -zz –skip-compress –checksum –bwlimit –partial –partial-dir –no-whole-file –whole-file –backup –backup-dir –suffix
+## --exclude --exclude-from --include --include-from --list-only --stats
+RSYNC_OPTIONAL_ARGS=""
+
 ## Preserve basic linux permissions
 PRESERVE_PERMISSIONS=yes
 PRESERVE_OWNER=yes
@@ -119,6 +127,10 @@ MAX_WAIT=7200
 
 ## ---------- BACKUP AND DELETION OPTIONS
 
+## Log a list of conflictual files
+LOG_CONFLICTS=yes
+## Send an email when conflictual files are found (implies LOG_CONFLICTS)
+ALERT_CONFLICTS=no
 ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
 CONFLICT_BACKUP=yes
 ## Keep multiple backup versions of the same file. Warning, This can be very space consuming.
@@ -154,9 +166,19 @@ DELTA_COPIES=yes
 ## ---------- ALERT OPTIONS
 
 ## List of alert mails separated by spaces
+## Most Unix systems (including Win10 bash) have mail support out of the box
+## Just make sure that the current user has enough privileges to use mail / mutt / sendmail and that the mail system is configured to allow outgoing mails
+## on pfSense platform, smtp support needs to be configured in System > Advanced > Notifications
 DESTINATION_MAILS=""
 
-## Windows specific (msys / cygwin environment) only mail options (used with mailsend.exe from muquit, http://github.com/muquit/mailsend or from sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail/)
+## Optional change of mail body encoding (using iconv)
+## By default, all mails are sent in UTF-8 format without header (because of maximum compatibility of all platforms)
+## You may specify an optional encoding here (like "ISO-8859-1" or whatever iconv can handle)
+MAIL_BODY_CHARSET=""
+
+## Additional mail parameters needed for Android / Busybox / Cygwin / MSYS
+## Android & Busybox use sendmail (and openssl if encryption is needed)
+## MSYS & Cygwin Windows mail support relies on mailsend.exe from muquit, http://github.com/muquit/mailsend which needs to be in %PATH% environment variable
 SENDER_MAIL="alert@your.system.tld"
 SMTP_SERVER=smtp.your.isp.tld
 SMTP_PORT=25
diff --git a/dev/tests/conf/remote.conf b/dev/tests/conf/remote.conf
index e948dfb..c0a7875 100644
--- a/dev/tests/conf/remote.conf
+++ b/dev/tests/conf/remote.conf
@@ -2,7 +2,7 @@
 
 ###### osync - Rsync based two way sync engine with fault tolerance
 ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr)
-###### osync v1.1x / v1.2x config file rev 2016102101
+###### osync v1.1x / v1.2x config file rev 2017060601
 
 ## ---------- GENERAL OPTIONS
 
@@ -23,6 +23,7 @@ SSH_RSA_PRIVATE_KEY="${HOME}/.ssh/id_rsa_local"
 ## Alternatively, you may specify an SSH password file (less secure). Needs sshpass utility installed.
 SSH_PASSWORD_FILE=""
 
+## When using ssh filter, you must specify a remote token matching the one setup in authorized_keys
 _REMOTE_TOKEN=SomeAlphaNumericToken9
 
 ## Create sync directories if they do not exist
@@ -81,6 +82,11 @@ REMOTE_3RD_PARTY_HOSTS="www.kernel.org www.google.com"
 
 ## ---------- MISC OPTIONS
 
+## Optional arguments passed to rsync executable. The following are already managed by the program and shoul never be passed here
+## -r -l -p -t -g -o -D -E - u- i- n --executability -A -X -L -K -H -8 -zz –skip-compress –checksum –bwlimit –partial –partial-dir –no-whole-file –whole-file –backup –backup-dir –suffix
+## --exclude --exclude-from --include --include-from --list-only --stats
+RSYNC_OPTIONAL_ARGS=""
+
 ## Preserve basic linux permissions
 PRESERVE_PERMISSIONS=yes
 PRESERVE_OWNER=yes
@@ -121,6 +127,10 @@ MAX_WAIT=7200
 
 ## ---------- BACKUP AND DELETION OPTIONS
 
+## Log a list of conflictual files
+LOG_CONFLICTS=yes
+## Send an email when conflictual files are found (implies LOG_CONFLICTS)
+ALERT_CONFLICTS=no
 ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
 CONFLICT_BACKUP=yes
 ## Keep multiple backup versions of the same file. Warning, This can be very space consuming.
@@ -156,9 +166,19 @@ DELTA_COPIES=yes
 ## ---------- ALERT OPTIONS
 
 ## List of alert mails separated by spaces
+## Most Unix systems (including Win10 bash) have mail support out of the box
+## Just make sure that the current user has enough privileges to use mail / mutt / sendmail and that the mail system is configured to allow outgoing mails
+## on pfSense platform, smtp support needs to be configured in System > Advanced > Notifications
 DESTINATION_MAILS=""
 
-## Windows specific (msys / cygwin environment) only mail options (used with mailsend.exe from muquit, http://github.com/muquit/mailsend or from sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail/)
+## Optional change of mail body encoding (using iconv)
+## By default, all mails are sent in UTF-8 format without header (because of maximum compatibility of all platforms)
+## You may specify an optional encoding here (like "ISO-8859-1" or whatever iconv can handle)
+MAIL_BODY_CHARSET=""
+
+## Additional mail parameters needed for Android / Busybox / Cygwin / MSYS
+## Android & Busybox use sendmail (and openssl if encryption is needed)
+## MSYS & Cygwin Windows mail support relies on mailsend.exe from muquit, http://github.com/muquit/mailsend which needs to be in %PATH% environment variable
 SENDER_MAIL="alert@your.system.tld"
 SMTP_SERVER=smtp.your.isp.tld
 SMTP_PORT=25