Merge pull request #44 from permalife/danny

Danny
Merge pull request #45 from permalife/danny

Danny
fix record_needs
Merge pull request #46 from permalife/master

to danny