closes partially #18