merge with master, incorporated propsoals from apollo13