reorganisation and int-add function
Merge branch 'development'