Closed issues #24. #26