Merge branch 'master' into dev
improved force calculation subroutine. faster calculation
Merge branch 'dev'