fix for issue #37
Merge branch 'csomerlot'