Merge pull request #36 from detiber/enterprise-2.1