Merge branch 'active'
readme gets picked up by npm from master rather than the default active branch