Merge pull request #2 from chyld/master