fixes #78
Merge commit '3bdb2d44e1c47eaf939d84c3986ff6705a8c9a11' into dev