Probably closes #1 (not tested though)