Addresses the following issues:
Fixes #3
Fixes #2