Fixes #7 and Closes #7