Merge pull request #234 from vrabaud/develop

fix potential crash for Fuerte on the farm
0.5.5
Merge branch 'release-0.5.5' into develop
update docs