Updated code to eliminate bugs
Merge branch 'master' of https://github.com/OpenDSA/OpenDSA