Version Update, fix two bugs