Issue1and2

fix issue #1 and #2