Sync with andromadus Jan 14 2013