Added ctrl c handling to elmering things
Merge remote branch 'origin/master'