Merge pull request #240 from gsn/master

Merged from beta.
Merge branch 'master' into test
Marianos (218). Spelling errors. throught -> through