Changed sqrt method
Merge origin/development into development