- Fixes #2 & Fixes #3