short fix
Short todo
merge
Merge branch 'master' of https://github.com/andmos/SNS