Closes #23
Issue #25