Fixed #27
Merge branch 'fix-27'