Commit for issue #20