* fix build errors
* fix .launch file
Merge branch 'issue187' into develop