Fixes Bug 681
Also fixed some spelling issues in the documentation