Edited with latest
Merge branch 'master' of https://github.com/andmos/SNS
merge
Edited outline