Pull Request #536 add admin tables