cleaned up and commented and chi
Merge remote-tracking branch 'origin/master'