Merge pull request #22 from RAPcores/sjk/functb1

Sjk/functb1