modified 2 files:
Merge pull request #5 from iu2fish/editbranch

modified 2 files: