fixing infinite loop
Merge branch 'develop' into simple_bot