Resolves #5

Resolves #5