Partial fix of #36
Merge master to orm: Partial fix of #36