bug fixes
Merge branch 'master' of https://github.com/deba2000/CS250B