Closes Issue #28

Closes Issue #26