continued work

Signed-off-by: Martin Säfsten <martin@safsten.se>
Merge branch 'master' of https://github.com/Marfyy/DcSharpProject