Merge branch 'devel'

* devel:
  Small fixes and additions