Devel

Merger of the development branch into the master branch.