old updates
Merge remote-tracking branch 'upstream/master'
Update: Finished commenting.
Merge pull request #2 from tfla/master

Update: Finished commenting.