Close #15
Resolves #15