Fixed Issue #156.
Issue #159
Issue #161