Merge current finchol into master