wip
Cleanup
Update dlls
Merge pull request #88 from jamietre/wip

Merge wip