Updated to work on Bukkit 1.6.4 R2.0