10/9/2013 (7:37 PM CST): Added comments into the code, no major changes.
Merge remote-tracking branch 'origin/master'