Fixes #1 - yay