Updated with files from 0.971b release