Fix #48
Merge branch 'ticket48' into dev