FB,cron
Merge pull request #44 from bra19/master

updates