Merge pull request #136 from RonPasquarelli/master

Addtional FB_14 implementation and refactoring