Don't use deprecated Falderal variable names anymore.
Added tag 0.1-2014.1230 for changeset 6490aea10e20