nodes fixed, parser slightly fixed, serialize & graphviz fixed
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14