Update personal fork with main as of 11PM October 14 2013 PDT