Edits

shoudl resolve #51