method defined twice
fix package names
reword changelog versions
dMerge branch 'release/1.0.1'