Merged devel to master, adjusted README a bit.