Make types external
Merge branch 'master' of https://github.com/Alllex/ParserCombinators