newidea merge
Merge pull request #57 from permalife/master

to danny
newidea merge
Merge pull request #58 from permalife/danny

Danny