Minor changes to Arm.cpp and Demo
Merge branch 'semistable' of https://github.com/nckswt/FARSHAPE into semistable