Feature/additions

Resolves #13