Merge pull request #48 from kreczko/dev

Moving manual changes to bcfg2 - Part 1