2222
Merge pull request #3 from adabrow/edits2

2222, fixes #1