#30 #31 #32 needs cleaning, and a final test on updated server
Merge branch 'master' of https://github.com/datalanche/csharp-datalanche