Merge pull request #158 from opjenkin/op-build-update_030_2-6-2020

op-build update 2-6-2020