Merge pull request #49 from permalife/danny

Danny
Merge pull request #50 from permalife/master

Merge pull request #49 from permalife/danny