Merge pull request #163 from sosiouxme/enterprise-2.0

Couple minor fixes
<check-sources> pave the way for RPM pkging