Added comments and such
Merge remote-tracking branch 'origin/master'
Small changes
Invariants
Merge remote-tracking branch 'origin/master'