parameters adjusted, avtivator added
Merge branch 'robot'