Feature/issue#10

Closes issue #10