Fixes #1 and Closes #2