Hopefully fixed pling inf-loop
Merge branch 'master' of github.com:slaeshjag/fanbot3