Fix bugs after merge
Merge branch 'master' of github.com:dzok/devcon4-robotics