Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
nuspec and ripple fixes
Merge branch 'master' into develop
Adjusted namespaces and renamed some copy-pasted code