Made a few tweaks to get this to compile on ubuntu
Merge branch 'master' of https://github.com/NeuroRoboticTech/AnimatLabPublicSource