Closed issue #1 to #4