Merge pull request #30 from permalife/master

master
Merge pull request #31 from permalife/danny

Merge pull request #30 from permalife/master