Merge/experimental/starksoftproxy

solution file fixed and some previous commits properly commented