Merge pull request #49 from permalife/danny

Danny