Fix #36
Merge branch 'development' into transformers