Updated for tarball development-2013-09-18.tgz