diff --git a/CHANGELOG.md b/CHANGELOG.md
index 149a9f0..2716d29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ KNOWN ISSUES
 RECENT CHANGES
 --------------
 
+XX Xxx 2016: osync v1.2-RC1 released
+- Improved unit tests
+
+30 Aug 2016: osync v1.2-beta released
+- Rendered more recent code compatible with bash 3.2+
 - Added a PKGBUILD file for ArchLinux thanks to Shadowigor (https://github.com/shaodwigor). Builds available at https://aur.archlinux.org/packages/osync/
 - Some more code compliance & more paranoia checks
 - Added more preflight checks
@@ -15,14 +20,12 @@ RECENT CHANGES
         - Fixed	bogus double log sent in alert mails
 - Made unix signals posix compliant
 - Config file upgrade script now updates header
-! test if waitfortaskcompletion kill self works okay with osync
 - Improved batch runner
 - Made keep logging value configurable and not mandatory
 - Fixed handling of processes in uninterruptible sleep state
 ! update doc on sudoers paths
 - Parallelized sync functions
 	- Rewrite sync resume process
-	! Remove conflict prevalance
 	- !doc about bandwidth
 - Added options to ignore permissions, ownership and groups
 - Refactored WaitFor... functions into one
diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh
index 7a5e7ea..77b1cdc 100755
--- a/dev/debug_osync.sh
+++ b/dev/debug_osync.sh
@@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
 AUTHOR="(C) 2013-2016 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
 PROGRAM_VERSION=1.2-beta
-PROGRAM_BUILD=2016083003
+PROGRAM_BUILD=2016083004
 IS_STABLE=no
 
 # Execution order						#__WITH_PARANOIA_DEBUG
@@ -45,7 +45,7 @@ IS_STABLE=no
 
 #### MINIMAL-FUNCTION-SET BEGIN ####
 
-## FUNC_BUILD=2016083002
+## FUNC_BUILD=2016083003
 ## BEGIN Generic bash functions written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## To use in a program, define the following variables:
@@ -79,7 +79,7 @@ ERROR_ALERT=false
 WARN_ALERT=false
 
 # Log from current run
-CURRENT_LOG=
+CURRENT_LOG=""
 
 ## allow function call checks			#__WITH_PARANOIA_DEBUG
 if [ "$_PARANOIA_DEBUG" == "yes" ];then		#__WITH_PARANOIA_DEBUG
@@ -3116,6 +3116,12 @@ function Init {
 	INITIATOR_SYNC_DIR="${INITIATOR_SYNC_DIR%/}/"
 	TARGET_SYNC_DIR="${TARGET_SYNC_DIR%/}/"
 
+	# Expand ~ if exists
+	INITIATOR_SYNC_DIR="${INITIATOR_SYNC_DIR/#\~/$HOME}"
+	TARGET_SYNC_DIR="${TARGET_SYNC_DIR/#\~/$HOME}"
+	SSH_RSA_PRIVATE_KEY="${SSH_RSA_PRIVATE_KEY/#\~/$HOME}"
+
+
 	## Replica format
 	## Why the f*** does bash not have simple objects ?
 	# Local variables used for state filenames
diff --git a/dev/n_osync.sh b/dev/n_osync.sh
index f0b569c..5f700f5 100755
--- a/dev/n_osync.sh
+++ b/dev/n_osync.sh
@@ -4,7 +4,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
 AUTHOR="(C) 2013-2016 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
 PROGRAM_VERSION=1.2-beta
-PROGRAM_BUILD=2016083003
+PROGRAM_BUILD=2016083004
 IS_STABLE=no
 
 # Execution order						#__WITH_PARANOIA_DEBUG
@@ -1671,6 +1671,12 @@ function Init {
 	INITIATOR_SYNC_DIR="${INITIATOR_SYNC_DIR%/}/"
 	TARGET_SYNC_DIR="${TARGET_SYNC_DIR%/}/"
 
+        # Expand ~ if exists
+        INITIATOR_SYNC_DIR="${INITIATOR_SYNC_DIR/#\~/$HOME}"
+        TARGET_SYNC_DIR="${TARGET_SYNC_DIR/#\~/$HOME}"
+        SSH_RSA_PRIVATE_KEY="${SSH_RSA_PRIVATE_KEY/#\~/$HOME}"
+
+
 	## Replica format
 	## Why the f*** does bash not have simple objects ?
 	# Local variables used for state filenames
diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh
index 0ff1d4f..51f598d 100644
--- a/dev/ofunctions.sh
+++ b/dev/ofunctions.sh
@@ -1,6 +1,6 @@
 #### MINIMAL-FUNCTION-SET BEGIN ####
 
-## FUNC_BUILD=2016083002
+## FUNC_BUILD=2016083003
 ## BEGIN Generic bash functions written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## To use in a program, define the following variables:
@@ -34,7 +34,7 @@ ERROR_ALERT=false
 WARN_ALERT=false
 
 # Log from current run
-CURRENT_LOG=
+CURRENT_LOG=""
 
 ## allow function call checks			#__WITH_PARANOIA_DEBUG
 if [ "$_PARANOIA_DEBUG" == "yes" ];then		#__WITH_PARANOIA_DEBUG
diff --git a/osync.sh b/osync.sh
index f403be7..2cf6878 100755
--- a/osync.sh
+++ b/osync.sh
@@ -4,14 +4,14 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
 AUTHOR="(C) 2013-2016 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
 PROGRAM_VERSION=1.2-beta
-PROGRAM_BUILD=2016083003
+PROGRAM_BUILD=2016083004
 IS_STABLE=no
 
 
 
 #### MINIMAL-FUNCTION-SET BEGIN ####
 
-## FUNC_BUILD=2016083002
+## FUNC_BUILD=2016083003
 ## BEGIN Generic bash functions written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## To use in a program, define the following variables:
@@ -45,7 +45,7 @@ ERROR_ALERT=false
 WARN_ALERT=false
 
 # Log from current run
-CURRENT_LOG=
+CURRENT_LOG=""
 
 
 ## allow debugging from command line with _DEBUG=yes
@@ -2952,6 +2952,12 @@ function Init {
 	INITIATOR_SYNC_DIR="${INITIATOR_SYNC_DIR%/}/"
 	TARGET_SYNC_DIR="${TARGET_SYNC_DIR%/}/"
 
+	# Expand ~ if exists
+	INITIATOR_SYNC_DIR="${INITIATOR_SYNC_DIR/#\~/$HOME}"
+	TARGET_SYNC_DIR="${TARGET_SYNC_DIR/#\~/$HOME}"
+	SSH_RSA_PRIVATE_KEY="${SSH_RSA_PRIVATE_KEY/#\~/$HOME}"
+
+
 	## Replica format
 	## Why the f*** does bash not have simple objects ?
 	# Local variables used for state filenames