Manual merge of Pull Request #205 via @gilesc50 and @ChALkeR (Fix for bug with JSON with multiple features)