merge and closes #2