Fixes #393
Merge #397
Merge branch 'Gioyik-fix#393' into dev