deads2k Merge pull request #26 from deads2k/rebase-11 …