Merge pull request #10 from lbr-stack/dev-common-fri-src

Merge pull request #10 from lbr-stack/dev-common-fri-src #19