Merge pull request #16 from permalife/master

master
loves
loves
view
Merge pull request #18 from permalife/danny

Danny