added #70
added #71