Added char delete
travis now builds develop
Merge branch 'master' into develop