fix issue #1
fix issue #2
new fixed version 1