hand merge #2. closes #2