Shard functionality improved
Merge branch 'master' of https://github.com/Iconum/Tennis-Knight