char if correction 2
char corrections
char corrections
update ignored
update to daniel's latest
Merge branch 'daniel'