Merge branch 'pr/26', close #26