Merge pull request #20 from EnhancedMinecraftTeam/master

@afroraydude MERGED
Merge pull request #21 from EnhancedMinecraftTeam/idManager

Merge pull request #20 from EnhancedMinecraftTeam/master