Merge branch 'master' of https://github.com/dskrad/dskrad
Merge branch 'master' of https://github.com/dskrad/dskrad