Close #1

Update regarding to Issue #1 .