Resolving issues

Closes issue #5 and #26