bla
Merge pull request #247 from andy2013march/master

new exceptions and 2 edits
Merge pull request #246 from sadasilva/master

Bla changes