fixed string bug
Merge branch 'master' of https://github.com/khuumi/SNL
merge