exceptions expanded and default no parameter constructors added
Merge origin/master