First attempt
Merge branch 'alan' of https://github.com/myGrid/DataHackLeiden into youri
Some error checking in constructor
Merge branch 'alan' of https://github.com/myGrid/DataHackLeiden into youri
So far still incomplete unit test.