fix for LB-140
Merge pull request #28 from isudana/master

fix for LB-140