fixes #145
fixed #137
v3.0.5
Merge branch 'edge' into dev