fixes #27
Merge branch 'dev'