Closes Issue #25.