Merge pull request #40 from flashii/master

peppy'ing it up
Merge pull request #41 from flashii/stable

Merge pull request #40 from flashii/master