Sni/issue 256

Solves issue #256 .
This PR is high priority !!