Fixes Issue #3 and Issue #4.