Added parser-source and started to modify lib's behaviour