Update
Update notes
Improve issue #34