Merging devel to master - v1.1.1 stuff