Closes #31
Issue #25