Issue 26 (merge after issue_20 and issue_22 as it contains them)