Add edition number to citation
Update changelog and bump versions
Merge branch 'release/0.2' into develop