Push changes from issue #74.