Fix #5
Merge branch 'dev'