Merge pull request #31 from permalife/danny

Merge pull request #30 from permalife/master
Merge pull request #32 from permalife/master

Merge pull request #31 from permalife/danny