Issue #243 and empty column replacements
Merge branch 'development' of github.com:tdt/core into development