V2 devel

Merging of version 2 into Master branch; v1 is already tagged.