adds edits from erst
Merge pull request #2 from KennethAshley/master

adds edits from erst