Added some code to handle Issue #9.