0.0.4 closes #2 and closes #3