Updated with files from 0.97b release