Commit 10. Fixes #3