Merged William's code from 12/29/14
Merge origin/master
Updates some comments in header