lergo-158 and lergo-166
Merge pull request #99 from lergo/build-326-regression

lergo-158 and lergo-166