Fixed Issue #33, #44, #45.