Fixes #14

Finally!