Updated to git commit 20cd06a