Fixed Issue #5.
Fixed Issue #6.