Merge pull request #47 from permalife/danny

Danny
Merge pull request #48 from permalife/master

Merge pull request #47 from permalife/danny