Readdresses the following issues:
Fixes #2