back to original plan
Merge pull request #1 from alecjohanson/alecj

back to original plan