issues595
Merge pull request #597 from angelk/issues595

issue 595