Fork to work on GraphX (on GraphX) todo: clean master