Fix #54
Merge branch 'master' into feature/refactor-reference-frames