Attempting to fix #3 & #4

Fixes #3

Fixes #4