fixes #31
Merge branch 'master' into plugin