fix issue #28
Merge branch 'pr/29'