Merge branch 'devel'
- Fix small issues