Merge pull request #13 from zonr/adpat-builder

Apply changes introduced by pull request #3 on dev/.