Merge pull request #40 from flashii/master

peppy'ing it up