fixed issue #2
fixed issue #1
fixed issue #3, updatet to version 1.0.1