2013-05-14: syncs with oscad