Updated with beta functions
Merge branch 'master' of https://github.com/ramblingpirate/Stanbot-5000