Fixes for issue #4 and issue #5.