See #128. Unit test to verify that #128 has been fixed
Merge branch 'master' into dev
Remove focus rocket
Merge branch 'master' into dev