Added char dev with some cleanup
Merge branch 'development'