Fixes #17 and Closes #17.