Add changes from the WDI NYC Feb14 repo