sni2 changes
Merge pull request #8 from fweber-de/dev

sni2 changes