Bugs fixing
Merge branch 'master' of https://github.com/neeravbm/s2p