I feel so productive! fixes #22