Merge pull/48 fomr Lojze: wrong parsing &, | or ; characters