added naclinfo in options of sws
Merge branch 'master' into wspp