fixes #69
Merge branch 'master' into devel