Merge pull request #30 from permalife/master

master