Repo up to date with code as of beginning of Fall 2014