Merge pull request #8 from spiiph/dev

Merged changes for CernVM compatibility.