Removed nonfunctional guessing code
Merge branch 'develop'