Fix blank names
Fix empty names
Updated on Sat Mar 30 15:31:47 EDT 2013
Re-add cache
merged on Sat Mar 30 15:32:44 EDT 2013