Merge pull request #668 from CanineHQ/feat/automatic-build-args