Merge pull request #1225 from nickavv/parachute

A bunch of small fixes
Merge branch 'master' of https://github.com/isenseDev/rSENSE into parachute