added comments in dev branch
added s1
added s2
added s3
merged dev into s2
merged dev into s3