roidrage Merge pull request #16 from obfuscurity/master