Fixed #28
Merge branch 'fix-28'