Switch to secure random source for SharedSecret
Fix issue in randint introduced from last commit
Merge branch 'develop'