fix #15
Merge branch 'dev'