rename manipulator interface
Merge branch 'issue-143' into develop
add newline at end of files
Merge branch 'issue-142' into develop