Minor improvements
Merge pull request #17 from ST-DDT/BUKKIT-5245-v2_improvements

Minor improvements