Merge pull request #48 from permalife/master

Merge pull request #47 from permalife/danny
conflict resolves
Merge pull request #49 from permalife/danny

Danny