Issue 10 updates

Resolves #10