merge
Merge pull request #22 from iu2fish/editbranch

merge