fix for issue 19 + comments