Commit 4/D
Merging pr1 into release