v2.1.0 closes #4 and #10