Devel

Attempt to merge devel into master