Fixes #18 and Closes #18.