Fix build_args issue, fixes #351
Merge pull request #352 from amitapl/dev

Fix build_args issue, fixes #351