added diagram and corrections
Merge pull request #642 from adamarla/master

added diagram and corrections