Fixes #16. About damn time.