Bugfixes

Implement DeviceManager, but there is Work left in the Dll
Merge remote-tracking branch 'origin/master'