dsd Merge pull request #16 from librehat/master