Issue #237
Merge branch 'development' of github.com:tdt/core into development
Issue #41