fixed
fix
fix
Merge branch 'dev' of github.com:Lich2013/jsns into dev