fixes #40
Merge branch 'dev'