Fixes #3 Part 1