hand merge #1. closes #1