WRAY-1 - Added common exceptions
Merge pull request #2 from zoid/WRAY-1

Merged
Merge pull request #6 from zoid/devel

Merge devel to master