Merge branch 'future'
Merge branch 'future'
Correcting new severe bug inserted by previous fix on issue #7
Releasing version 1.2.3
Merge branch 'hotfix_issue#7' into future