Issue 3

Should be remerged (issue 6 was merged here)