Merge branch 'upgrade_binary_compatibility' into develop

closes #4