Proofread basic, composite
Merge branch 'master' of github.com:sramas15/snap-python
Merge remote branch 'upstream/master'