Merge pull request #1 from 0xDEADFACE/master