Manually ported McAndre's changes
Version bump for npm