Merge PR #2, solved checklist conflict