Commits for ticket #1 and #8.