0.4, parser updates, docs updated
Conflicts fixed