Merge pull request #2 from kisonecat/master #30

Closed aberdean closed 10 years ago