Merge pull request #2 from kisonecat/master