Bug fixes
Merge branch 'master' of https://github.com/nharada1/thetomatonetwork
Updated algo stuff and modified server settings
Merge changes