Merged in #1