Final merge request before the name change. Mostly this is typos and small corrections #81

Closed bcaffo closed 10 years ago