added all of 20140822 source code from Joel