Merge remote-tracking branch 'origin/graph_plan'
Merge branch 'master' of https://github.com/Jirsch/iAI