Working release2. Waiting for DATA and NET changes
Merge pull request #75 from adoulrac/release2/integ

Working release2. Waiting for DATA and NET changes