Fixed #26
Merge branch 'fix-26'