Updated to work with 1.6 bukkit/spigot and fixed bug.