spacekookie Merge pull request #2 from nonchip/master …