Updated version and added #313 as a TODO