Merge pull request #47 from permalife/danny

Danny