armon Merge pull request #52 from p0pr0ck5/master …