Changes for issue 13, 14, 16, 17