Merge pull request #22 from RonPasquarelli/master

Additional FB_13 cleanup.