some optimizations
Merge branch 'master' of https://github.com/dwsoto/SWE
Merge branch 'master' of https://github.com/dwsoto/SWE
Merge branch 'master' of https://github.com/dwsoto/SWE
fixed tests