Merge devel to master v0.5

Merge v0.5