diff --git a/Gemfile b/Gemfile
index b3d51462a..7ef8cc3f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,6 +37,7 @@ gem 'nokogiri', '1.6.1'
 gem 'odba', '1.1.0'
 gem 'oddb2tdat', '1.1.2'
 gem 'paypal', '2.0.0'
+gem 'parslet', '1.7.0'
 gem 'pg', '0.12.0'
 gem 'rclconf', '1.0.0'
 gem 'rdoc', '3.9.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index ec5f883bc..d46caa0bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,6 +16,7 @@ GEM
       nokogiri
     archive-tarsimple (1.1.1)
     bigdecimal (1.1.0)
+    blankslate (3.1.3)
     builder (3.2.2)
     childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
@@ -103,6 +104,8 @@ GEM
       watir-webdriver (>= 0.6.11)
     page_navigation (0.9)
       data_magic (>= 0.14)
+    parslet (1.7.0)
+      blankslate (>= 2.0, <= 4.0)
     paypal (2.0.0)
       money (> 0.0.0)
     pg (0.12.0)
@@ -233,6 +236,7 @@ DEPENDENCIES
   odba (= 1.1.0)
   oddb2tdat (= 1.1.2)
   page-object
+  parslet (= 1.7.0)
   paypal (= 2.0.0)
   pg (= 0.12.0)
   pry-debugger
diff --git a/install_gems.sh b/install_gems.sh
index a6e9c02f4..dc39938e5 100644
--- a/install_gems.sh
+++ b/install_gems.sh
@@ -33,6 +33,7 @@ gem install net-http-persistent --version=2.9.3
 gem install nokogiri --version=1.6.2.1
 gem install odba --version=1.1.0
 gem install oddb2tdat --version=1.1.2
+gem install parslet --version=1.7.0
 gem install paypal --version=2.0.0
 gem install pg --version=0.12.0
 gem install rclconf --version=1.0.0
diff --git a/src/plugin/compositions_syntax.rb b/src/plugin/compositions_syntax.rb
new file mode 100644
index 000000000..3eab347a2
--- /dev/null
+++ b/src/plugin/compositions_syntax.rb
@@ -0,0 +1,554 @@
+# encoding: utf-8
+
+# This file is shared since oddb2xml 2.0.0 (lib/oddb2xml/parse_compositions.rb)
+# with oddb.org src/plugin/parse_compositions.rb
+#
+# It allows an easy parsing of the column P Zusammensetzung of the swissmedic packages.xlsx file
+#
+
+require 'parslet'
+require 'parslet/convenience'
+include Parslet
+
+class CompositionParser < Parslet::Parser
+
+  # Single character rules
+  rule(:lparen)     { str('(') }
+  rule(:rparen)     { str(')') }
+  rule(:comma)      { str(',') }
+
+  rule(:space)      { match('\s').repeat(1) }
+  rule(:space?)     { space.maybe }
+
+  # Things
+  rule(:digit) { match('[0-9]') }
+  rule(:digits) { digit.repeat(1) }
+  rule(:number) {
+    (
+      str('-').maybe >> (
+        str('0') | (match('[1-9]') >> match('[0-9\']').repeat)
+      ) >> (
+            (str('*') >>  digit.repeat(1)).maybe >>
+            (match(['.,^']) >> digit.repeat(1)).repeat(1)
+      ).maybe >> (
+        match('[eE]') >> (str('+') | str('-')).maybe >> digit.repeat(1)
+      ).maybe
+    )
+  }
+  rule(:radio_isotop) { match['a-zA-Z'].repeat(1) >> lparen >> digits >> str('-') >> match['a-zA-Z'].repeat(1-3) >> rparen >>
+                        ((space? >> match['a-zA-Z']).repeat(1)).repeat(0)
+                        } # e.g. Xenonum (133-Xe) or yttrii(90-Y) chloridum zum Kalibrierungszeitpunkt
+  rule(:ratio_value) { match['0-9:\-\.,'].repeat(1)  >> space?}  # eg. ratio: 1:1, ratio: 1:1.5-2.4., ratio: 1:0.68-0.95, 1:4,1
+
+  # handle stuff like acidum 9,11-linolicum or 2,2'-methylen-bis(6-tert.-butyl-4-methyl-phenolum) specially. it must contain at least one a-z
+  rule(:umlaut) { match(['éàèèçïöäüâ']) }
+  rule(:identifier_D12) { match['a-zA-Z'] >>  match['0-9'].repeat(1) }
+
+  # TODO: why do we have to hard code these identifiers?
+  rule(:fix_coded_identifiers) {
+    str("2,2'-methylen-bis(6-tert.-butyl-4-methyl-phenolum)") |
+    str('A + B') |
+    str('CRM 197') |
+    str('F.E.I.B.A.') |
+    str('LA ') >> digit.repeat(1,2) >> str('% TM') |
+    str('TM:') | str('&') |
+    str('ethanol.') |
+    str('poloxamerum 238') |
+    str('polysorbatum ') >> digit >> digit
+  }
+
+  # TODO: Sind diese Abkürzung wirklich Teil eines Substanznamens?
+  rule(:identifier_abbrev_with_comma)  {
+    str('aquos') |
+    str('ca.') |
+    str('deklar.') |
+    str('spag.') |
+    str('spec.') |
+    str('spp.') |
+    str('ssp.') |
+    str('var.')
+  }
+  rule(:fix_coded_doses) {
+    digit >> digit.maybe >> space >> str('per centum ') >> str('q.s.').maybe |
+    str('50/50') |
+    str('1g/9.6 cm²') |
+    str('9 g/L 5.4 ml')
+  }
+  rule(:identifier)  {  fix_coded_identifiers |
+                        identifier_abbrev_with_comma |
+                        fix_coded_doses |
+                        str('q.s.') |
+                        identifier_D12 |
+                        identifier_without_comma |
+                        identifier_with_comma
+                     }
+
+  rule(:identifier_with_comma) {
+    match['0-9,\-'].repeat(0) >> (match['a-zA-Z']|umlaut)  >> (match(['_,']).maybe >> (match['0-9a-zA-Z\-\'\/'] | umlaut)).repeat(0)
+  }
+
+  rule(:identifier_without_comma) {
+    match['0-9\',\-'].repeat(0) >> (match['a-zA-Z']|umlaut)  >> (match(['_']).maybe >> (match['0-9a-zA-Z\-\'\/'] | umlaut)).repeat(0) >>
+        lparen >> (rparen.absent? >> any).repeat(1) >> rparen
+  }
+  rule(:one_word) { match['a-zA-Z'] >> match['0-9'].repeat(1) | match['a-zA-Z'].repeat(1) }
+  rule(:in_parent) { lparen >> one_word.repeat(1) >> rparen }
+  rule(:words_nested) { one_word.repeat(1) >> in_parent.maybe >> space? >> one_word.repeat(0) }
+  # dose
+  # 150 U.I. hFSH et 150 U.I. hLH
+  rule(:units) {
+      str('cm²') |
+      str('g/dm²') |
+      str('g/l') |
+      str('g/L') |
+      str('% V/V') |
+      str('µg/24 h') |
+      str('µg/g') |
+      str('µg') |
+      str('ng') |
+      str('guttae') |
+      str('mg/g') |
+      str('mg/ml') |
+      str('MBq/ml') |
+      str('MBq') |
+      str('CFU') |
+      str('mg') |
+      str('Mg') |
+      str('kJ') |
+      str('G') |
+      str('g') |
+      str('I.E.') |
+      str('l') |
+      str('µl') |
+      str('U. Ph. Eur.') |
+      str('ml') |
+      str('µmol') |
+      str('mmol/l') |
+      str('mmol') |
+      str('Mio CFU') |
+      str('Mio U.I.') |
+      str('Mio U.') |
+      str('Mio. U.I.') |
+      str('Mio. U.') |
+      str('Mia. U.I.') |
+      str('Mia. U.') |
+      str('S.U.') |
+      str('U. Botox') |
+      str('U.I. hFSH') |
+      str('U.I. hCG') |
+      str('U.I. hLH') |
+      str('U.I.') |
+      str('U./ml') |
+      str('U.K.I.') |
+      str('U.') |
+      str('Mia.') |
+      str('Mrd.') |
+      str('% m/m') |
+      str('% m/m') |
+      str('%')
+  }
+  rule(:dose_unit) { units.as(:unit) }
+  rule(:qty_range)       { (number >> space? >> (str('+/-') | str(' - ') | str(' -') | str('-') | str('±') ) >> space? >> number).as(:qty_range) }
+  rule(:qty_unit)       { dose_qty >> (space >> dose_unit).maybe }
+  rule(:dose_qty)       { number.as(:qty) }
+  rule(:min_max)        { (str('min.') | str('max.') | str('ca.') | str('<') ) >> space? }
+  # 75 U.I. hFSH et 75 U.I. hLH
+  rule(:dose_fsh) { qty_unit >> space >> str('et') >> space >> qty_unit.as(:dose_right) }
+  rule(:dose_per) { (digits >> str('/') >> digits).as(:qty)}
+  rule(:dose)           { dose_fsh |
+                          dose_per |
+                          ( min_max.maybe >>
+                            ( (qty_range >> (space >> dose_unit).maybe) | (qty_unit | dose_qty |dose_unit)) >> space? ) >>
+                        str('pro dosi').maybe >> space?
+                           }
+  rule(:dose_with_unit) { min_max.maybe >>
+                            dose_fsh |
+                          ( qty_range >> space >> dose_unit |
+                            dose_qty  >> space >> dose_unit
+                          ) >>
+                          space?
+                        }
+  rule(:operator)   { match('[+]') >> space? }
+
+  # Grammar parts
+  rule(:useage) {   (any >> str('berzug:')) | # match Überzug
+                    str('antiox.:') |
+                    str('arom.:') |
+                    str('conserv.:') |
+                    str('color.:')
+                   }
+
+  # Match Wirkstoffe like E 270
+  rule(:lebensmittel_zusatz) {  str('E').as(:lebensmittel_zusatz) >> space >>
+                                (digits >> match['(a-z)'].repeat(0,3)).as(:digits) >>
+                                (space >> dose.as(:dose_lebensmittel_zusatz)).maybe >> space?
+
+                   }
+   # DER: 1:4 or DER: 3.5:1 or DER: 6-8:1 or DER: 4.0-9.0:1'
+  rule(:der_identifier) { str('DER:')  >> space >> digit >> match['0-9\.\-:'].repeat }
+  rule(:der) { (der_identifier).as(:substance_name) >> space? >> dose.maybe.as(:dose) }
+  rule(:forbidden_in_substance_name) {
+                            min_max |
+                            useage |
+                            excipiens_identifiers |
+                            pro_identifiers |
+                            corresp_substance_label |
+                            (digits.repeat(1) >> space >> str(':')) | # match 50 %
+                            str(', corresp.') |
+                            str('Beutel: ') |
+                            str('Mio ') |
+                            str('ad emulsionem') |
+                            str('ad globulos') |
+                            str('ad pulverem') |
+                            str('ad q.s. ') |
+                            str('ad solutionem') |
+                            str('ad suspensionem') |
+                            str('ana partes') |
+                            str('ana ') |
+                            str('aqua ad ') |
+                            str('aqua q.s. ') |
+                            str('corresp. ca.,') |
+                            str('et ') |
+                            str('excipiens') |
+                            str('partes') |
+                            str('pro capsula') |
+                            str('pro dosi') |
+                            str('pro vitroe') |
+                            str('q.s. ad ') |
+                            str('q.s. pro ') |
+                            str('ratio:') |
+                            str('ut alia: ') |
+                            str('ut ')
+    }
+  rule(:name_without_parenthesis) {
+    (
+      (str('(') | forbidden_in_substance_name).absent? >>
+        (radio_isotop | str('> 1000') | str('> 500') | identifier.repeat(1) >> str('.').maybe) >>
+      space?
+    ).repeat(1)
+  }
+
+  rule(:part_with_parenthesis) { lparen >> ( (lparen | rparen).absent? >> any).repeat(1) >>
+                                 (part_with_parenthesis | rparen >> str('-like:') | rparen  ) >> space?
+                               }
+  rule(:name_with_parenthesis) {
+    forbidden_in_substance_name.absent? >>
+    ((comma | lparen).absent? >> any).repeat(0) >> part_with_parenthesis >>
+    (forbidden_in_substance_name.absent? >> (identifier.repeat(1) | part_with_parenthesis | rparen) >> space?).repeat(0)
+  }
+  rule(:substance_name) { (
+                            name_with_parenthesis |
+                            name_without_parenthesis
+                          ) >>
+                          str('pro dosi').maybe >> space?
+                          }
+  rule(:simple_substance) { substance_name.as(:substance_name) >> space? >> dose.maybe.as(:dose)}
+  rule(:simple_subtance_with_digits_in_name_and_dose)  {
+    substance_lead.maybe.as(:more_info) >> space? >>
+    (name_without_parenthesis >> space? >> ((digits.repeat(1) >> (str(' %') | str('%')) | digits.repeat(1)))).as(:substance_name) >>
+    space >> dose_with_unit.as(:dose)
+  }
+
+
+  rule(:substance_more_info) { # e.g. "acari allergeni extractum 5000 U.:
+      (str('ratio:').absent? >> (identifier|digits) >> space?).repeat(1) >> space? >> (str('U.:') | str(':')| str('.:')) >> space?
+    }
+
+  rule(:pro_identifiers) {
+                       str('ut aqua ad iniectabilia q.s. ad emulsionem pro ') |
+                       str('aqua ').maybe >> str('ad iniectabilia q.s. ad solutionem pro ') |
+                       str('aqua ').maybe >> str('ad solutionem pro ')  |
+                       str('aqua ').maybe >> str('q.s. ad emulsionem pro ') |
+                       str('aqua ').maybe >> str('q.s. ad gelatume pro ') |
+                       str('aqua ').maybe >> str('q.s. ad solutionem pro ') |
+                       str('aqua ').maybe >> str('q.s. ad suspensionem pro ') |
+                       str('doses pro vase ') |
+                       str('excipiens ad emulsionem pro ') |
+                       str('excipiens ad pulverem pro ') |
+                       str('excipiens ad solutionem pro ') |
+                       str('pro vase ') |
+                       str('q.s. ad pulverem pro ')
+  }
+  rule(:excipiens_dose) { pro_identifiers.as(:excipiens_description) >> space? >> dose.as(:dose) >> space? >> ratio.maybe.as(:ratio) >>
+                    space? >> str('corresp.').maybe >> space? >> dose.maybe.as(:dose_corresp)
+                    }
+
+  rule(:excipiens_identifiers)  {
+                       str('ad globulos') |
+                       str('ad pulverem') |
+                       str('ad solutionem') |
+                       str('aether q.s.') |
+                       str('ana partes') |
+                       str('aqua ad iniectabilia q.s. ad solutionem') |
+                       str('aqua ad iniectabilia') |
+                       str('aqua q.s. ad') |
+                       str('excipiens pro compresso obducto') |
+                       str('excipiens pro compresso') |
+                       str('excipiens pro praeparatione') |
+                       str('excipiens') |
+                       str('pro charta') |
+                       str('pro praeparatione') |
+                       str('pro vitro') |
+                       str('q.s. ad') |
+                       str('q.s. pro praeparatione') |
+                       str('saccharum ad') |
+                       str('solvens (i.v.): aqua ad iniectabilia')
+                      }
+
+  rule(:excipiens)  { substance_lead.maybe.as(:more_info) >> space? >>
+                      ( excipiens_dose | (excipiens_identifiers >> any.repeat(0)).as(:excipiens_description)) >>
+                      any.repeat(0)
+                    }
+
+  rule(:substance_lead) { useage >> space? |
+                      str('Beutel:') >> space? |
+                      str('residui:') >> space? |
+                      str('mineralia:') >> str(':') >> space? |
+                      str('Solvens:') >> space? |
+                      substance_more_info
+    }
+  rule(:corresp_substance_label) {
+      str(', corresp. ca.,') |
+      str('corresp. ca.,') |
+      str('corresp.,') |
+      str('corresp.') |
+      str(', corresp.')
+    }
+  rule(:ratio) { str('ratio:') >>  space >> ratio_value }
+
+  rule(:solvens) { (str('Solvens:') | str('Solvens (i.m.):'))>> space >> (any.repeat).as(:more_info) >> space? >>
+                   (substance.as(:substance) >> str('/L').maybe).maybe  >>
+                    any.maybe
+                }
+    # Perhaps we could have some syntax sugar to make this more easy?
+    #
+    def tag(opts={})
+        close = opts[:close] || false
+    end
+
+    # TODO: what does ut alia: impl?
+  rule(:substance_ut) {
+   (space? >> (str('pro dosi ut ') | str('ut ') ) >>
+    space? >> str('alia:').absent? >>substance
+  ) >>
+    space?
+    }
+
+  rule(:corresp_substance) {
+                            (corresp_substance_label) >> space? >>
+                            (
+                             substance |
+                             dose.as(:dose_corresp_2) |
+                             excipiens.as(:excipiens)
+                            )
+  }
+
+  rule(:substance) {
+      (
+        simple_subtance_with_digits_in_name_and_dose |
+        der |
+        substance_lead.maybe.as(:more_info) >> space? >> lebensmittel_zusatz |
+        substance_lead.maybe.as(:more_info) >> space? >> simple_substance >> str('pro dosi').maybe
+      ).as(:substance) >>
+      (space? >> str(', ').maybe >> ratio.maybe).as(:ratio) >>
+      space? >> corresp_substance.maybe.as(:chemical_substance) >>
+      space? >> substance_ut.repeat(0).as(:substance_ut)
+  }
+  rule(:histamin) { str('U = Histamin Equivalent Prick').as(:histamin) }
+  rule(:praeparatio){ ((one_word >> space?).repeat(1).as(:description) >> str(':') >> space?).maybe >>
+                      (name_with_parenthesis | name_without_parenthesis).repeat(1).as(:substance_name) >>
+                      number.as(:qty) >> space >> str('U.:') >> space? >>
+                      ((identifier >> space?).repeat(1).as(:more_info) >> space?).maybe
+                    }
+  rule(:substance_separator) { (str(', et ') | comma | str('et ') | str('ut alia: ')) >> space? }
+  rule(:one_substance)       { (praeparatio | histamin | substance) >> space? >> ratio.as(:ratio).maybe >> space? }
+  rule(:all_substances)      { (one_substance >> substance_separator.maybe).repeat(1) >> space? >> excipiens.as(:excipiens).maybe}
+  rule(:composition)         { all_substances }
+  rule(:long_labels) {
+        str('Praeparatio sicca cum solvens: praeparatio sicca:') |
+        str('Praeparatio cryodesiccata') >> (str(':').absent? >> any).repeat(0) >> str(':') |
+        str('Tela cum praeparatione (Panel ') >> digit >> str('):')
+      }
+  rule(:label_id) {
+     (
+        str('V') |
+        str('IV') |
+        str('III') |
+        str('II') |
+        str('I') |
+        str('A') |
+        str('B') |
+        str('C') |
+        str('D') |
+        str('E')
+     )
+  }
+  rule(:label_separator) {  (str('):')  | str(')')) }
+  rule(:label) { label_id.as(:label) >> space? >>
+    label_separator >> str(',').absent?  >>
+               (space? >> (match(/[^:]/).repeat(0)).as(:label_description)  >> str(':') >> space).maybe
+  }
+  rule(:leading_label) {    label_id >> label_separator >> (str(' et ') | str(', ') | str(' pro usu: ') | space) >>
+                            label_id >> label_separator >> any.repeat(1)  |
+                            long_labels.as(:label) |
+                            label
+    }
+  rule(:corresp_label) {
+    str('aqua ') |
+    str('excipiens ') |
+    str('doses ') |
+    str('Pulver: ') |
+    str('Diluens: ') |
+    str('Solutio reconstituta:') |
+    str('Corresp., ') |
+    str('Corresp. ') |
+    str('corresp. ')
+  }
+  rule(:corresp_line) { corresp_label >> any.repeat(1).as(:corresp)  |
+                        ((label_id >> label_separator >> space? >> str('et ').maybe).repeat(1) >> any.repeat(1)).as(:corresp)
+                      }
+  rule(:corresp_line_neu) { corresp_label >> any.repeat(1).as(:corresp) }
+
+  rule(:solvens_label) {
+    str('Solvens (i.v.)') |
+    str('Solvens (i.m.)') |
+    str('Solvens')
+  }
+  rule(:solvens_line) { solvens_label.as(:label) >> (str(': ') >> composition.repeat(1).as(:composition) | any.repeat(1).as(:corresp))}
+
+  rule(:multiple_et_line) {
+                        ((label_id >> label_separator >> space? >> (str('pro usu') |str('et '))).repeat(1) >> any.repeat(1)).as(:corresp)
+  }
+
+  rule(:polvac) { label_id.as(:label) >> label_separator >> space? >> composition.as(:composition) >> space? >> str('.').maybe >> space? }
+
+  rule(:label_comment_excipiens) { label >> space? >> excipiens.as(:excipiens) >> space? >> str('.').maybe >> space? }
+
+  rule(:label_id_composition) { label_id.as(:label) >> label_separator >>
+                                ((space >> identifier).repeat(1) >> str(':')).maybe.as(:label_description) >>
+                                composition.as(:composition)  }
+
+  rule(:expression_comp) {
+    solvens_line |
+    multiple_et_line |
+    label_id_composition |
+    corresp_line_neu |
+    leading_label.maybe >> space? >> composition.as(:composition) >> space? >> str('.').maybe >> space? |
+    polvac |
+    label_comment_excipiens |
+    excipiens.as(:composition) |
+    space.repeat(3)
+  }
+
+  rule(:expression_compD) {
+    solvens_line |
+    multiple_et_line.as('multiple_et_line') |
+    label_id_composition.as('label_id_composition') |
+    corresp_line_neu.as('corresp_line_neu') |
+    leading_label.maybe >> space? >> composition.as(:composition) >> space? >> str('.').maybe >> space? |
+    polvac.as('polvac') |
+    label_comment_excipiens.as('label_comment_excipiens') |
+    excipiens.as(:composition) |
+    space.repeat(3)
+  }
+
+  root :expression_comp
+end
+
+class GalenicFormParser < CompositionParser
+
+  rule(:prepation_separator) { str(', ') | str("\n") }
+
+  rule(:prepation_name) { ((prepation_separator|lparen).absent? >> any).repeat(1)
+                          }
+  rule(:dose_with_pro) {
+                            ( match('[0-9a-zA-Z]').repeat(1) >>
+                               str('/') >>
+                              match('[0-9a-zA-Z\'%]').repeat(1)
+                            ).maybe
+  }
+
+  rule(:gal_form) {
+    qty_unit_silent.maybe >>
+    ((( str("\n") # |
+        str(',') >> space? >> qty_unit_silent |
+        digits >> str('%')
+      ).absent? >> any).repeat(1) >>
+        (lparen >> (rparen.absent? >> any).repeat(1) >> rparen).maybe
+    ).as(:galenic_form) >>
+    space?
+
+  }
+
+  rule(:standard_galenic) {
+                            prepation_name.as(:prepation_name) >> space? >>
+                            prepation_separator >> space? >>
+                            (name_without_parenthesis >> qty_unit_silent >> prepation_separator).maybe >>
+                            (qty_unit_silent >> space?).maybe >>
+                            (dose_with_pro >> space? >> str(',') >> space?).maybe >>
+                            gal_form >> space?
+                         }
+
+  rule(:qty_unit_silent) { number >> space >> units  }
+  rule(:name_then_dose) { ((space.absent? >> any).repeat(1) >>
+                            space >> qty_unit_silent).as(:prepation_name) >> space?.as(:galenic_form)
+                          }
+
+  rule(:only_name) { any.repeat(1).as(:prepation_name) >> space?.as(:galenic_form)
+                     }
+
+  rule(:name_comma_gal_form) { (space.absent? >> any).repeat(1).as(:prepation_name) >>
+                                comma >> space >>
+                                any.repeat(1).as(:galenic_form)
+                              }
+  rule(:simple_name) { ((match(["a-zA-Z0-9,%"]) | str('-') | umlaut).repeat(1))  >>
+                       (lparen >> (rparen.absent? >> any.repeat(1)) >> rparen).maybe
+                     }
+  rule(:name_gal_form) { # e.g. Dicloabak 0,1% Augentropfen or 35 Clear-Flex 3,86 % Peritonealdialyselösung
+                           (simple_name >> space).repeat(1).as(:prepation_name) >>
+                           space? >>
+                            (dose_with_pro >> space?).maybe >>
+                          (digits.absent? >> gal_form) >> space?
+  }
+
+  rule(:name_without_comma_gal_form) { # Sulfure de Rhénium (186Re)-RE-186-MM-1 Cis bio International
+    ((str(', ')| str(',') >> match(['A-Z'])).absent? >> any).repeat(1).as(:prepation_name) >>
+    comma >> space? >>
+    gal_form >> space?
+  }
+
+# Phytopharma foie et bile capsules/Leber-Galle Kapseln
+  rule(:leber_gallen_kapseln) { ((str('/Leber-Galle Kapseln').absent? >> any).repeat(1)).as(:prepation_name)  >>
+                                str('/') >> any.repeat(1).as(:galenic_form) >>
+                                space?
+                              }
+# Plak-out Spray 0,1 %
+  rule(:plak_out_spray) { str('Plak-out Spray 0,1 %').as(:prepation_name)  >>
+                                space? >> str('dummy').maybe.as(:galenic_form) >> space?
+                              }
+  rule(:galenic)   {
+                     plak_out_spray |
+                     leber_gallen_kapseln |
+                     standard_galenic |
+                     name_comma_gal_form |
+                     name_then_dose >> space? |
+                     name_without_comma_gal_form |
+                     name_gal_form |
+                     only_name >> space? |
+                     space?
+                   }
+
+  # for debugging purposes only
+  rule(:galenicD)   {
+                     plak_out_spray.as(:plak_out_spray) |
+                     leber_gallen_kapseln.as(:leber_gallen_kapseln) |
+                     standard_galenic.as(:standard_galenic) |
+                     name_comma_gal_form.as(:name_comma_gal_form) |
+                     name_then_dose.as(:name_then_dose) >> space? |
+                     name_without_comma_gal_form.as(:name_without_comma_gal_form) |
+                     name_gal_form.as(:name_gal_form) |
+                     only_name.as(:only_name) >> space? |
+                     space?
+                   }
+  root :galenic
+end
\ No newline at end of file
diff --git a/src/plugin/parse_compositions.rb b/src/plugin/parse_compositions.rb
deleted file mode 100644
index 3eaa16d0e..000000000
--- a/src/plugin/parse_compositions.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-# encoding: utf-8
-
-# This file is shared since oddb2xml 2.0.0 (lib/oddb2xml/parse_compositions.rb)
-# with oddb.org src/plugin/parse_compositions.rb
-#
-# It allows an easy parsing of the column P Zusammensetzung of the swissmedic packages.xlsx file
-#
-
-module ParseUtil
-  SCALE_P = %r{pro\s+(?<scale>(?<qty>[\d.,]+)\s*(?<unit>[kcmuµn]?[glh]))}u
-  ParseComposition   = Struct.new("ParseComposition",  :source, :label, :label_description, :substances, :galenic_form, :route_of_administration)
-  ParseSubstance     = Struct.new("ParseSubstance",    :name, :qty, :unit, :chemical_substance, :chemical_qty, :chemical_unit, :is_active_agent, :dose, :cdose)
-  def ParseUtil.capitalize(string)
-    string.split(/\s+/u).collect { |word| word.capitalize }.join(' ')
-  end
-
-  def ParseUtil.dose_to_qty_unit(string, filler=nil)
-    return nil unless string
-    dose = string.split(/\b\s*(?![.,\d\-]|Mio\.?)/u, 2)
-    if dose && (scale = SCALE_P.match(filler)) && dose[1] && !dose[1].include?('/')
-      unit = dose[1] << '/'
-      num = scale[:qty].to_f
-      if num <= 1
-        unit << scale[:unit]
-      else
-        unit << scale[:scale]
-      end
-      dose[1] = unit
-    elsif dose and dose.size == 2
-      unit = dose[1]
-    end
-    dose
-  end
-
-  def ParseUtil.parse_compositions(composition, active_agents_string = '')
-    rep_1 = '----';   to_1 = '('
-    rep_2 = '-----';  to_2 = ')'
-    rep_3 = '------'; to_3 = ','
-    active_agents = active_agents_string ? active_agents_string.downcase.split(/,\s+/) : []
-    comps = []
-    label_pattern = /^(?<label>A|I|B|II|C|III|D|IV|E|V|F|VI)(\):|\))\s*(?<description>[^:]+)/
-    composition_text = composition.gsub(/\r\n?/u, "\n")
-    puts "composition_text for #{name}: #{composition_text}" if composition_text.split(/\n/u).size > 1 and $VERBOSE
-    lines = composition_text.split(/\n/u)
-    idx = 0
-    compositions = lines.select do |line|
-      if match = label_pattern.match(line)
-        label = match[:label]
-        label_description = match[:description]
-      else
-        label = nil
-        label_description = nil
-      end
-      idx += 1
-      next if idx > 1 and /^(?<label>A|I|B|II|C|III|D|IV|E|V|F|VI)[)]\s*(et)/.match(line) # avoid lines like 'I) et II)'
-      next if idx > 1 and /^Corresp\./i.match(line) # avoid lines like 'Corresp. mineralia: '
-      substances = []
-      filler = line.split(',')[-1].sub(/\.$/, '')
-      filler_match = /^(?<name>[^,\d]+)\s*(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))/.match(filler)
-      components = line.gsub(/(\d),(\d+)/, "\\1.\\2").split(/([^\(]+\([^)]+\)[^,]+|),/).each {
-        |component|
-        next unless component.size > 0
-        next if /^ratio:/i.match(component.strip)
-        to_consider = component.strip.split(':')[-1].gsub(to_1, rep_1).gsub(to_2, rep_2).gsub(to_3, rep_3) # remove label
-        # very ugly hack to ignore ,()
-        ptrn1 = /^(?<name>.+)(\s+|$)(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))/
-        m =  /^(?<name>.+)(\s+|$)/.match(to_consider)
-        m_with_dose = ptrn1.match(to_consider)
-        m = m_with_dose if m_with_dose
-        if m2 = /^(|[^:]+:\s)(E\s+\d+)$/.match(component.strip)
-          to_add = ParseSubstance.new(m2[2], '', nil, nil, nil, nil, active_agents.index(m2[2].downcase) ? true : false)
-          substances << to_add
-        elsif m
-          ptrn = /(?<name>.+)\s+(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))(\s*(?:ut|corresp\.?)\s+(?<chemical>[^\d,]+)\s*(?<cdose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))(\s*[mv]\/[mv])?))?)/
-          m_with_chemical = ptrn.match(to_consider)
-          m = m_with_chemical if m_with_chemical
-          name      = m[:name].strip
-          chemical  = m_with_chemical ? m[:chemical] : nil
-          cdose     = m_with_chemical ? m[:cdose] : nil
-          dose      = m_with_dose     ? m[:dose]  : nil
-          if m_with_chemical and active_agents.index(m_with_chemical[:chemical].strip)
-            is_active_agent = true
-            name            = m[:chemical].strip
-            dose            = m[:cdose]
-            chemical        = m[:name].strip
-            cdose           = m[:dose]
-          else
-            is_active_agent =  active_agents.index(m[:name].strip) != nil
-          end
-          unit = nil
-          name = name.gsub(rep_3, to_3).gsub(rep_2, to_2).gsub(rep_1, to_1)
-          emulsion_pattern = /\s+pro($|\s+)|emulsion|solution/i
-          next if emulsion_pattern.match(name)
-          name = name.split(/\s/).collect{ |x| x.capitalize }.join(' ').strip
-          chemical = chemical.split(/\s/).collect{ |x| x.capitalize }.join(' ').strip if chemical
-          qty,  unit  = ParseUtil.dose_to_qty_unit(dose, filler)
-          cqty, cunit = ParseUtil.dose_to_qty_unit(cdose, filler)
-          dose = "#{qty} #{unit}" if unit and unit.match(/\//)
-          substances << ParseSubstance.new(name, qty, unit, chemical, cqty, cunit, is_active_agent, dose, cdose)
-        end
-      }
-      comps << ParseComposition.new(line, label, label_description, substances) if substances.size > 0
-    end
-    comps
-  end
-end
\ No newline at end of file
diff --git a/src/plugin/parslet_compositions.rb b/src/plugin/parslet_compositions.rb
new file mode 100644
index 000000000..22939246e
--- /dev/null
+++ b/src/plugin/parslet_compositions.rb
@@ -0,0 +1,489 @@
+# encoding: utf-8
+
+# This file is shared since oddb2xml 2.0.0 (lib/oddb2xml/parse_compositions.rb)
+# with oddb.org src/plugin/parse_compositions.rb
+#
+# It allows an easy parsing of the column P Zusammensetzung of the swissmedic packages.xlsx file
+#
+
+require 'parslet'
+require 'parslet/convenience'
+require 'plugin/compositions_syntax'
+include Parslet
+VERBOSE_MESSAGES ||= false
+
+module ParseUtil
+  # this class is responsible to patch errors in swissmedic entries after
+  # oddb.org detected them, as it takes sometimes a few days (or more) till they get corrected
+  # Reports the number of occurrences of each entry
+  class HandleSwissmedicErrors
+
+    attr_accessor :nrParsingErrors
+    class ErrorEntry   < Struct.new('ErrorEntry', :pattern, :replacement, :nr_occurrences)
+    end
+
+    def reset_errors
+      @errors = []
+      @nrLines = 0
+      @nrParsingErrors = 0
+    end
+
+    # error_entries should be a hash of  pattern, replacement
+    def initialize(error_entries)
+      reset_errors
+      error_entries.each{ |pattern, replacement| @errors << ErrorEntry.new(pattern, replacement, 0) }
+    end
+
+    def report
+      s = ["Report of changed compositions in #{@nrLines} lines. Had #{@nrParsingErrors} parsing errors" ]
+      @errors.each {
+        |entry|
+      s << "  replaced #{entry.nr_occurrences} times '#{entry.pattern}'  by '#{entry.replacement}'"
+      }
+      s
+    end
+
+    def apply_fixes(string)
+      result = string.clone
+      @errors.each{
+        |entry|
+        intermediate = result.clone
+        result = result.gsub(entry.pattern,  entry.replacement)
+        unless result.eql?(intermediate)
+            entry.nr_occurrences += 1
+            puts "#{File.basename(__FILE__)}:#{__LINE__}: fixed \nbefore: #{intermediate}\nafter:  #{result}" unless defined?(RSpec)
+        end
+      }
+      @nrLines += 1
+      result
+    end
+    #  hepar sulfuris D6 2,2 mg hypericum perforatum D2 0,66 mg where itlacks a comma and should be hepar sulfuris D6 2,2 mg, hypericum perforatum D2 0,66 mg
+  end
+
+  def ParseUtil.capitalize(string)
+    string.split(/\s+/u).collect { |word| word.capitalize }.join(' ').strip
+  end
+
+  def ParseUtil.parse_compositions(composition_text, active_agents_string = '')
+    active_agents = active_agents_string ? active_agents_string.downcase.split(/,\s+/) : []
+    comps = []
+    lines = composition_text.gsub(/\r\n?/u, "\n").split(/\n/u)
+    lines.select {
+      |line|
+      composition =  ParseComposition.from_string(line)
+      if composition.is_a?(ParseComposition)
+        composition.substances.each {
+          |substance_item|
+          substance_item.is_active_agent = (active_agents.find {|x| x.downcase.eql?(substance_item.name.downcase) } != nil)
+          substance_item.is_active_agent = true if substance_item.chemical_substance and active_agents.find {|x| x.downcase.eql?(substance_item.chemical_substance.name.downcase) }
+         }
+        comps << composition
+      end
+    }
+    comps << ParseComposition.new(composition_text.split(/,|:|\(/)[0]) if comps.size == 0
+    comps
+  end
+
+end
+
+class IntLit   < Struct.new(:int)
+  def eval; int.to_i; end
+end
+class QtyLit   < Struct.new(:qty)
+  def eval; qty.to_i; end
+end
+
+class CompositionTransformer < Parslet::Transform
+  @@more_info = nil
+  def CompositionTransformer.get_ratio(parse_info)
+    if parse_info[:ratio]
+      if parse_info[:ratio].to_s.length > 0 and parse_info[:ratio].to_s != ', '
+        parse_info[:ratio].to_s.sub(/^,\s+/, '').sub(/,\s+$/,'')
+      else
+        nil
+      end
+    else
+      nil
+    end
+  end
+
+  def CompositionTransformer.check_e_substance(substance)
+    return unless /^E \d\d\d/.match(substance.name)
+    unless substance.more_info
+      case substance.name[2]
+      when "1"
+        substance.more_info = 'color.'
+      when "2"
+        substance.more_info = 'conserv.'
+      else
+      end
+      substance.more_info ||= @@more_info
+    end
+    @@more_info = substance.more_info
+  end
+
+  def CompositionTransformer.add_excipiens(info)
+    @@more_info           = nil
+    @@excipiens           = ParseSubstance.new(info[:excipiens_description] ? info[:excipiens_description] : 'Excipiens')
+    @@excipiens.dose      = info[:dose] if info[:dose]
+    @@excipiens.more_info = CompositionTransformer.get_ratio(info)
+    @@excipiens.cdose     = info[:dose_corresp] if info[:dose_corresp]
+    @@excipiens.more_info = info[:more_info] if info[:more_info]
+  end
+
+  rule(:corresp => simple(:corresp),
+       ) {
+    |dictionary|
+      puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+      @@corresp = dictionary[:corresp].to_s
+  }
+  rule( :substance_name => simple(:substance_name),
+        :dose => simple(:dose),
+      ) {
+    |dictionary|
+        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+        dose = dictionary[:dose].is_a?(ParseDose) ? dictionary[:dose] : nil
+        substance = ParseSubstance.new(dictionary[:substance_name], dose)
+        @@substances <<  substance
+        substance
+  }
+
+  rule( :more_info => simple(:more_info),
+      ) {
+    |dictionary|
+        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+        @@corresp = dictionary[:more_info].to_s.strip.sub(/:$/, '')
+  }
+  rule( :more_info => simple(:more_info),
+        :substance_name => simple(:substance_name),
+        :dose => simple(:dose),
+      ) {
+    |dictionary|
+        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+        dose = dictionary[:dose].is_a?(ParseDose) ? dictionary[:dose] : nil
+        substance = ParseSubstance.new(dictionary[:substance_name].to_s, dose)
+        substance.more_info = dictionary[:more_info].to_s.strip.sub(/:$/, '') if dictionary[:more_info] and dictionary[:more_info].to_s.length > 0
+        CompositionTransformer.check_e_substance(substance)
+        @@substances <<  substance
+        substance
+  }
+
+  rule(:lebensmittel_zusatz => simple(:lebensmittel_zusatz),
+       :more_info => simple(:more_info),
+       :digits => simple(:digits)) {
+    |dictionary|
+      puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+      substance =  ParseSubstance.new("#{dictionary[:lebensmittel_zusatz]} #{dictionary[:digits]}")
+      substance.more_info = dictionary[:more_info].to_s.strip.sub(/:$/, '') if dictionary[:more_info] and dictionary[:more_info].to_s.length > 0
+      CompositionTransformer.check_e_substance(substance)
+      @@substances <<  substance
+      substance
+  }
+  rule(:excipiens => subtree(:excipiens),
+       ) {
+    |dictionary|
+      puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+      info = dictionary[:excipiens].is_a?(Hash) ? dictionary[:excipiens] : dictionary[:excipiens].first
+      if info[:excipiens_description] or
+       info[:dose] or
+       info[:dose_corresp] or
+       info[:more_info] or
+       CompositionTransformer.get_ratio(dictionary)
+       CompositionTransformer.add_excipiens(info)
+       info
+      end
+      nil
+  }
+  rule(:composition => subtree(:composition),
+       ) {
+    |dictionary|
+       puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+       info = dictionary[:composition].is_a?(Hash) ? dictionary[:composition] : dictionary[:composition].first
+       CompositionTransformer.add_excipiens(info) if info.is_a?(Hash)
+       info
+       }
+  rule(:substance => simple(:substance),
+       :chemical_substance => simple(:chemical_substance),
+       :substance_ut => sequence(:substance_ut),
+       :ratio => simple(:ratio),
+       ) {
+    |dictionary|
+       puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+       ratio = CompositionTransformer.get_ratio(dictionary)
+       if ratio and ratio.length > 0
+        if dictionary[:substance].more_info
+          dictionary[:substance].more_info += ' ' + ratio.strip
+        else
+          dictionary[:substance].more_info = ratio.strip
+        end
+       end
+       if  dictionary[:chemical_substance]
+        dictionary[:substance].chemical_substance = dictionary[:chemical_substance]
+        @@substances -= [dictionary[:chemical_substance]]
+       end
+       if  dictionary[:substance_ut].size > 0
+        dictionary[:substance].salts += dictionary[:substance_ut].last.salts
+        dictionary[:substance_ut].last.salts = []
+        dictionary[:substance].salts << dictionary[:substance_ut].last
+        @@substances -= dictionary[:substance_ut]
+       end
+       dictionary[:substance]
+  }
+
+  rule(:int => simple(:int))        { IntLit.new(int) }
+  rule(:number => simple(:nb)) {
+    nb.match(/[eE\.]/) ? Float(nb) : Integer(nb)
+  }
+  rule(
+    :qty_range    => simple(:qty_range),
+    :unit   => simple(:unit))  {
+      ParseDose.new(qty_range, unit)
+    }
+  rule(
+    :qty_range    => simple(:qty_range)) {
+      ParseDose.new(qty_range)
+    }
+  rule(
+    :qty    => simple(:qty),
+    :unit   => simple(:unit))  {
+      ParseDose.new(qty, unit)
+    }
+  rule(
+    :unit    => simple(:unit))  { ParseDose.new(nil, unit) }
+  rule(
+    :qty    => simple(:qty))  { ParseDose.new(qty, nil) }
+  rule(
+    :qty    => simple(:qty),
+    :unit    => simple(:unit),
+    :dose_right    => simple(:dose_right),
+  )  {
+    dose = ParseDose.new(qty, unit)
+    dose.unit = dose.unit.to_s + ' et ' + ParseDose.new(dose_right).to_s
+    dose
+  }
+
+  @@substances ||= []
+  @@excipiens  = nil
+  def CompositionTransformer.clear_substances
+    @@more_info  = nil
+    @@substances = []
+    @@excipiens  = nil
+    @@corresp    = nil
+  end
+  def CompositionTransformer.substances
+    @@substances.clone
+  end
+  def CompositionTransformer.excipiens
+    @@excipiens ? @@excipiens.clone : nil
+  end
+  def CompositionTransformer.corresp
+    @@corresp ? @@corresp.clone : nil
+  end
+end
+
+class ParseDose
+  attr_reader :qty, :qty_range
+  attr_accessor :unit
+  def initialize(qty=nil, unit=nil)
+    puts "ParseDose.new from #{qty.inspect} #{unit.inspect} #{unit.inspect}" if VERBOSE_MESSAGES
+    if qty and (qty.is_a?(String) || qty.is_a?(Parslet::Slice))
+      string = qty.to_s.gsub("'", '')
+      if string.index('-') and (string.index('-') > 0)
+        @qty_range = string
+      elsif string.index(/\^|\*|\//)
+        @qty  = string
+      else
+        @qty  = string.index('.') ? string.to_f : string.to_i
+      end
+    elsif qty
+      @qty  = qty.eval
+    else
+      @qty = 1
+    end
+    @unit = unit ? unit.to_s : nil
+  end
+  def eval
+    self
+  end
+  def to_s
+    return @unit unless @qty or @qty_range
+    res = "#{@qty}#{@qty_range}"
+    res = "#{res} #{@unit}" if @unit
+    res
+  end
+end
+
+class ParseSubstance
+  attr_accessor  :name, :qty, :unit, :chemical_substance, :chemical_qty, :chemical_unit, :is_active_agent, :dose, :cdose, :is_excipiens
+  attr_accessor  :description, :more_info, :salts
+  def initialize(name, dose=nil)
+    puts "ParseSubstance.new from #{name.inspect} #{dose.inspect}" if VERBOSE_MESSAGES
+    @name = ParseUtil.capitalize(name.to_s)
+    @name.sub!(/\baqua\b/i, 'aqua')
+    @name.sub!(/\bDER\b/i, 'DER')
+    @name.sub!(/\bad pulverem\b/i, 'ad pulverem')
+    @name.sub!(/\bad iniectabilia\b/i, 'ad iniectabilia')
+    @name.sub!(/\bad suspensionem\b/i, 'ad suspensionem')
+    @name.sub!(/\bad solutionem\b/i, 'ad solutionem')
+    @name.sub!(/\bpro compresso\b/i, 'pro compresso')
+    @name.sub!(/\bpro\b/i, 'pro')
+    @name.sub!(/ Q\.S\. /i, ' q.s. ')
+    @name.sub!(/\s+\bpro$/i, '')
+    @dose = dose if dose
+    @salts = []
+  end
+  def qty
+    return @dose.qty_range if @dose and @dose.qty_range
+    @dose ? @dose.qty : @qty
+  end
+  def unit
+    return @unit if @unit
+    @dose ? @dose.unit : @unit
+  end
+  def to_string
+    s = "#{@name}:"
+    s = " #{@qty}" if @qty
+    s = " #{@unit}" if @unit
+    s += @chemical_substance.to_s if chemical_substance
+    s
+  end
+end
+
+class ParseComposition
+  attr_accessor   :source, :label, :label_description, :substances, :galenic_form, :route_of_administration,
+                  :corresp, :excipiens
+
+  ErrorsToFix = { /(\d+)\s+\-\s*(\d+)/ => '\1-\2',
+                  'o.1' => '0.1',
+                  /\s+(mg|g) DER:/ => ' \1, DER:',
+                  ' mind. ' => ' min. ',
+                  ' streptococci pyogen. ' => ' streptococci pyogen ',
+                  ' ut excipiens' => ', excipiens',
+                  ' Corresp. ' => ' corresp. ',
+                  ',,' => ',',
+                  'avena elatior,dactylis glomerata' => 'avena elatior, dactylis glomerata',
+                  ' color.: corresp. ' => ' corresp.',
+                  / U\.: (excipiens) / =>  ' U. \1 ',
+                  / U\.: (alnus|betula|betula|betulae) / =>  ' U., \1 ',
+                  /^(acari allergeni extractum (\(acarus siro\)|).+\s+U\.\:)/ => 'A): \1',
+                  'Solvens: alprostadilum' => 'alprostadilum',
+                }
+  @@errorHandler = ParseUtil::HandleSwissmedicErrors.new( ErrorsToFix )
+
+  def initialize(source)
+    @substances ||= []
+    puts "ParseComposition.new from #{source.inspect} @substances #{@substances.inspect}" if VERBOSE_MESSAGES
+    @source = source.to_s
+  end
+  def ParseComposition.reset
+    @@errorHandler = ParseUtil::HandleSwissmedicErrors.new( ErrorsToFix )
+  end
+  def ParseComposition.report
+    @@errorHandler.report
+  end
+  def ParseComposition.from_string(string)
+    return nil if string == nil or  string.eql?('.') or string.eql?('')
+    stripped = string.gsub(/^"|["\n]+$/, '')
+    return nil unless stripped
+    if /(U\.I\.|U\.)$/.match(stripped)
+      cleaned = stripped
+    else
+      cleaned = stripped.sub(/[\.]+$/, '')
+    end
+    value = nil
+    puts "ParseComposition.from_string #{string}" if VERBOSE_MESSAGES # /ng-tr/.match(Socket.gethostbyname(Socket.gethostname).first)
+
+    cleaned = @@errorHandler.apply_fixes(cleaned)
+    puts "ParseComposition.new cleaned #{cleaned}" if VERBOSE_MESSAGES and not cleaned.eql?(stripped)
+    CompositionTransformer.clear_substances
+    result = ParseComposition.new(cleaned)
+    parser = CompositionParser.new
+    transf = CompositionTransformer.new
+    begin
+      if defined?(RSpec)
+        ast = transf.apply(parser.parse_with_debug(cleaned))
+        puts "#{File.basename(__FILE__)}:#{__LINE__}: ==> " if VERBOSE_MESSAGES
+        pp ast if VERBOSE_MESSAGES
+      else
+        ast = transf.apply(parser.parse(cleaned))
+      end
+    rescue Parslet::ParseFailed => error
+      @@errorHandler.nrParsingErrors += 1
+      puts "#{File.basename(__FILE__)}:#{__LINE__}: failed parsing ==>  #{cleaned}"
+      return nil
+    end
+    result.source = string
+    return result unless ast
+    return result if ast.is_a?(Parslet::Slice)
+
+    result.substances = CompositionTransformer.substances
+    result.excipiens = CompositionTransformer.excipiens
+    result.corresp = CompositionTransformer.corresp if CompositionTransformer.corresp
+    if result.excipiens and result.excipiens.unit
+      pro_qty = "/#{result.excipiens.qty} #{result.excipiens.unit}".sub(/\/1\s+/, '/')
+      result.substances.each {
+        |substance|
+            next unless substance.is_a?(ParseSubstance)
+          substance.chemical_substance.unit = "#{substance.chemical_substance.unit}#{pro_qty}"    if substance.chemical_substance
+          substance.dose.unit               = "#{substance.dose.unit}#{pro_qty}"                  if substance.unit and not substance.unit.eql?(result.excipiens.unit)
+      }
+    end
+    if ast.is_a?(Array) and  ast.first.is_a?(Hash)
+      label = ast.first[:label].to_s if ast.first[:label]
+      label_description = ast.first[:label_description].to_s if ast.first[:label_description]
+    elsif ast and ast.is_a?(Hash)
+      label = ast[:label].to_s if  ast[:label]
+      label_description = ast[:label_description].to_s if ast[:label_description]
+    end
+    if label
+      if label and not /((A|B|C|D|E|I|II|III|IV|\)+)\s+et\s+(A|B|C|D|E|I|II|III|IV|\))+)/.match(label)
+        result.label  = label
+      end
+      result.label_description = label_description.gsub(/:+$/, '').strip if label_description
+    end
+    result.corresp = ast[:corresp].to_s.sub(/:\s+/, '') if not result.corresp and ast.is_a?(Hash) and ast[:corresp]
+    return result
+  end
+end
+
+class GalenicFormTransformer < CompositionTransformer
+
+  rule( :preparation_name => simple(:preparation_name),
+        :galenic_form => simple(:preparation_name),
+      ) {
+    |dictionary|
+        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+        name = dictionary[:preparation_name] ? dictionary[:preparation_name].to_s : nil
+        form = dictionary[:galenic_form] ? dictionary[:galenic_form].to_s : nil
+        # name, form
+  }
+end
+
+class ParseGalenicForm
+  def ParseGalenicForm.from_string(string)
+    return nil if string == nil
+    stripped = string.gsub(/^"|["\n]+$/, '')
+    return nil unless stripped
+    puts "ParseGalenicForm.from_string #{string}" if VERBOSE_MESSAGES # /ng-tr/.match(Socket.gethostbyname(Socket.gethostname).first)
+
+    parser = GalenicFormParser.new
+    transf = GalenicFormTransformer.new
+    begin
+      if defined?(RSpec)
+        ast = transf.apply(parser.parse_with_debug(string))
+        puts "#{File.basename(__FILE__)}:#{__LINE__}: ==> " if VERBOSE_MESSAGES
+        pp ast if VERBOSE_MESSAGES
+      else
+        ast = transf.apply(parser.parse(string))
+      end
+    rescue Parslet::ParseFailed => error
+      @@errorHandler.nrParsingErrors += 1
+      puts "#{File.basename(__FILE__)}:#{__LINE__}: failed parsing ==>  #{string}"
+      return nil
+    end
+    return [] unless ast
+    form = ast[:galenic_form] ? ast[:galenic_form].to_s.sub(/^\/\s+/, '') : nil
+    name = ast[:prepation_name] ? ast[:prepation_name].to_s.strip : nil
+    return [name,  form]
+  end
+end
\ No newline at end of file
diff --git a/src/plugin/swissmedic.rb b/src/plugin/swissmedic.rb
index aefee8fc5..607374b14 100644
--- a/src/plugin/swissmedic.rb
+++ b/src/plugin/swissmedic.rb
@@ -5,7 +5,7 @@
 require 'mechanize'
 require 'ostruct'
 require 'plugin/plugin'
-require 'plugin/parse_compositions'
+require 'plugin/parslet_compositions'
 require 'pp'
 require 'util/persistence'
 require 'util/today'