Added extra validation
Merge branch 'feature' of github.com:webonise/s4g into feature