Resolves #10

code review