Last changes for tonight. New version pushed to bukkitdev