Merge devel to master v0.5

v0.5