Close #25
Merge branch 'dev'