Merged in and updated crop branch.