Update to Johnny's FB source code (2014/10/20)