stricter exceptions, better static method names
Merge release fixes back into develop (0.1)