Added Felix changes from 2014-02-19