Added todo for file parser.
Merge remote-tracking branch 'origin/morphology' into morphology
Added documentation, removed deprecated things.