Pull #28. Fixes #18.