few changes, issue #1 closed