Merge pull request #61 from sudoman/sudoman-fixes