refactored latest code
Merge branch 'semistable' of https://github.com/nckswt/FARSHAPE into semistable
huh
refactored latest code