Fix for v1.0.0
new Version 2.0.0
merged v1.0.0-fixes