Merge branch 'master' of https://github.com/dirkbuslei/D3SO