merge

closes #21