This commit tests and fixes #23