Fixed #9
Issue #10
Issue #16