Closed issue #12
Closed issue #7