added merged code and fixes (site-2013-08-23.zip)