Merge branch 'raindev-local'
Khoin method implemented (very inaccurate results were obtained).